aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2017-03-07 11:04:19 +1030
committerAlan Modra <amodra@gmail.com>2017-03-07 12:32:31 +1030
commitb1b07054c08eea65ba8d1a9f771796d686f337e5 (patch)
tree745e32833a44ad334bf77202934b1071b66b3d30
parentbb98f85480da563f4f6438abdabb68a69bc746b8 (diff)
downloadfsf-binutils-gdb-b1b07054c08eea65ba8d1a9f771796d686f337e5.zip
fsf-binutils-gdb-b1b07054c08eea65ba8d1a9f771796d686f337e5.tar.gz
fsf-binutils-gdb-b1b07054c08eea65ba8d1a9f771796d686f337e5.tar.bz2
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.
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elf64-ppc.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 92682d5..9560ad2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2017-03-07 Alan Modra <amodra@gmail.com>
+
+ PR 21224
+ PR 20519
+ * elf64-ppc.c (ppc64_elf_relocate_section): Add missing
+ dyn_relocs check.
+
2017-03-05 Alan Modra <amodra@gmail.com>
* elf-bfd.h (struct eh_cie_fde): Add u.cie.per_encoding_aligned8.
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 84cb214..d0673c9 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -14804,8 +14804,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))