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.
This commit is contained in:
Alan Modra 2016-08-27 08:59:29 +09:30
parent e55c2fc0ef
commit 8a9e8e72fe
2 changed files with 25 additions and 4 deletions

View File

@ -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.

View File

@ -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;