From 0d69827324f704b75ac7e5c2b39219cdd15e790b Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 7 Mar 2017 11:04:19 +1030 Subject: [PATCH] PowerPC64 abort due to dynamic relocs on hidden undefweak ppc64_elf_relocate_section lacked a check which meant that it emitted dynamic relocs against a hidden undefweak symbol for which no dynamic relocs had been allocated. PR 21224 PR 20519 * elf64-ppc.c (ppc64_elf_relocate_section): Add missing dyn_relocs check. --- bfd/ChangeLog | 7 +++++++ bfd/elf64-ppc.c | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 459c4050c29..17e7e3b9bf8 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2017-03-07 Alan Modra + + PR 21224 + PR 20519 + * elf64-ppc.c (ppc64_elf_relocate_section): Add missing + dyn_relocs check. + 2017-03-07 Alan Modra Apply from master diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index e7d47922454..3381647c467 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -14798,8 +14798,10 @@ ppc64_elf_relocate_section (bfd *output_bfd, break; if (bfd_link_pic (info) - ? ((h != NULL && pc_dynrelocs (h)) - || must_be_dyn_reloc (info, r_type)) + ? ((h == NULL + || h->dyn_relocs != NULL) + && ((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)) -- 2.47.3