Revert previous delta, instead do this.

	* elf32-hppa.c (elf32_hppa_finish_dynamic_sections): Don't count
	.plt relocs in DT_RELASZ.

1 files changed, 17 insertions, 2 deletions

diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index 7d65a14ab1..61c3e6fb98 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -2368,8 +2368,10 @@ elf32_hppa_size_dynamic_sections (output_bfd, info)
 	{
 	  if (s->_raw_size != 0)
 	    {
-	      /* Remember whether there are any reloc sections.  */
-	      relocs = true;
+	      /* Remember whether there are any reloc sections other
+		 than .rela.plt.  */
+	      if (s != htab->srelplt)
+		relocs = true;
 
 	      /* We use the reloc_count field as a counter if we need
 		 to copy relocs into the output file.  */
@@ -4274,6 +4276,19 @@ elf32_hppa_finish_dynamic_sections (output_bfd, info)
 	      else
 		dyn.d_un.d_val = s->_raw_size;
 	      break;
+
+	    case DT_RELASZ:
+	      /* Don't count procedure linkage table relocs in the
+		 overall reloc count.  */
+	      if (htab->srelplt != NULL)
+		{
+		  s = htab->srelplt->output_section;
+		  if (s->_cooked_size != 0)
+		    dyn.d_un.d_val -= s->_cooked_size;
+		  else
+		    dyn.d_un.d_val -= s->_raw_size;
+		}
+	      break;
 	    }
 
 	  bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);