aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2013-11-11 13:46:26 +1030
committerAlan Modra <amodra@gmail.com>2013-11-15 16:30:18 +1030
commitac6f50a1e8f85daed1c13eedee914ea8d8bcbb84 (patch)
tree9f769019bbad261e0698d1b74d559fc21bc9eb80
parent4e525783ce6ccc27cf4057dfb60d90eec6645a6a (diff)
downloadbinutils-ac6f50a1e8f85daed1c13eedee914ea8d8bcbb84.zip
binutils-ac6f50a1e8f85daed1c13eedee914ea8d8bcbb84.tar.gz
binutils-ac6f50a1e8f85daed1c13eedee914ea8d8bcbb84.tar.bz2
PowerPC64 ELFv2, allocate dynreloc space for ifunc
(cherry picked from commit 14b5f73fac0e34c2fca81aa0dfbc9c7eebc922f2)
-rw-r--r--bfd/ChangeLog3
-rw-r--r--bfd/elf64-ppc.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 10e4038..84f213e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,9 @@
2013-11-15 Alan Modra <amodra@gmail.com>
Apply changes from mainline to 2.24
+ 2013-11-11 Alan Modra <amodra@gmail.com>
+ * elf64-ppc.c (allocate_dynrelocs): Revert 2013-11-04 change.
+
2013-11-11 Ulrich Weigand <uweigand@de.ibm.com>
* elf64-ppc.c (ppc64_elf_edit_toc): Use SYMBOL_REFERENCES_LOCAL
here, not SYMBOL_CALLS_LOCAL.
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 44af20ad..bf13a5d 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -9417,8 +9417,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
if (eh->dyn_relocs == NULL
|| (!htab->elf.dynamic_sections_created
- && (h->type != STT_GNU_IFUNC
- || !htab->opd_abi)))
+ && h->type != STT_GNU_IFUNC))
return TRUE;
/* In the shared -Bsymbolic case, discard space allocated for