Fix commit 980aa3e6

Commit 980aa3e6 was supposed to cure dyn_reloc counting problems, but
did the opposite.  For PIC we count two types of dyn_reloc, those on
pc-relative relocs, and the total.  If a sym needs pc-relative dyn
relocs then all the relocs are dynamic.  If not, then only those that
are must_be_dyn_reloc are dynamic.

	PR 20519
	* elf64-ppc.c (pc_dynrelocs): New function.
	(ppc64_elf_relocate_section): Use it and must_be_dyn_reloc to
	handle pic dynamic relocs.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4790c28c4f676c4f4b4687b9ac887844d8862174..0ac0206f9826f4a431cb07ad147a99c880922aef 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-27  Alan Modra  <amodra@gmail.com>
+
+       PR 20519
+       * elf64-ppc.c (pc_dynrelocs): New function.
+       (ppc64_elf_relocate_section): Use it and must_be_dyn_reloc to
+       handle pic dynamic relocs.
+
 2016-08-26  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
        * bfd-in.h (struct elf32_arm_params): Define.

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 286130cb416b4878ac29b883cb9e1b975e2a65e0..a9cedb58e85b9c18391587cdda99374082b49f6d 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -7173,6 +7173,19 @@ alias_readonly_dynrelocs (struct elf_link_hash_entry *h)
   return FALSE;
 }
 
+/* Return whether EH has pc-relative dynamic relocs.  */
+
+static bfd_boolean
+pc_dynrelocs (struct ppc_link_hash_entry *eh)
+{
+  struct elf_dyn_relocs *p;
+
+  for (p = eh->dyn_relocs; p != NULL; p = p->next)
+    if (p->pc_count != 0)
+      return TRUE;
+  return FALSE;
+}
+
 /* Return true if a global entry stub will be created for H.  Valid
    for ELFv2 before plt entries have been allocated.  */
 
@@ -14745,10 +14758,11 @@ ppc64_elf_relocate_section (bfd *output_bfd,
          if (NO_OPD_RELOCS && is_opd)
            break;
 
-         if (h != NULL
-             ? h->dyn_relocs != NULL
-             : (bfd_link_pic (info)
-                ? must_be_dyn_reloc (info, r_type)
+         if (bfd_link_pic (info)
+             ? ((h != NULL && pc_dynrelocs (h))
+                || must_be_dyn_reloc (info, r_type))
+             : (h != NULL
+                ? h->dyn_relocs != NULL
                 : ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC))
            {
              bfd_boolean skip, relocate;