diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-12-16 20:31:08 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-12-16 20:31:08 +0000 |
| commit | 73bcf2338555a1d0b2e5e1eaaecd263498d19967 (patch) | |
| tree | 1ef649908975759d6c34317a2708fb00b9801f90 /bfd | |
| parent | 3d745be3fca9cfd3cbfb09c224a6c7312bec4de3 (diff) | |
| download | gdb-73bcf2338555a1d0b2e5e1eaaecd263498d19967.zip gdb-73bcf2338555a1d0b2e5e1eaaecd263498d19967.tar.gz gdb-73bcf2338555a1d0b2e5e1eaaecd263498d19967.tar.bz2 | |
Also check local IFUNC references
bfd/
PR ld/14968
* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Also check
local IFUNC references.
* elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol): Likewise.
ld/testsuite/
PR ld/14968
* ld-ifunc/ifunc-18a-i386.d: New file.
* ld-ifunc/ifunc-18a-x86-64.d: Likewise.
* ld-ifunc/ifunc-18a.s: Likewise.
* ld-ifunc/ifunc-18b-i386.d: Likewise.
* ld-ifunc/ifunc-18b-x86-64.d: Likewise.
* ld-ifunc/ifunc-18b.s: Likewise.
* ld-ifunc/ifunc-19a-i386.d: Likewise.
* ld-ifunc/ifunc-19a-x86-64.d: Likewise.
* ld-ifunc/ifunc-19a.s: Likewise.
* ld-ifunc/ifunc-19b-i386.d: Likewise.
* ld-ifunc/ifunc-19b-x86-64.d: Likewise.
* ld-ifunc/ifunc-19b.s: Likewise.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 8 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 8 |
3 files changed, 18 insertions, 7 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 87cc9d7..070acb4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,13 @@ +2012-12-16 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/14968 + * elf32-i386.c (elf_i386_adjust_dynamic_symbol): Also check + local IFUNC references. + * elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol): Likewise. + 2012-12-14 Tom Tromey <tromey@redhat.com> - * elf.c (elfcore_grok_note) <NT_FILE>: New case. + * elf.c (elfcore_grok_note) <NT_FILE>: New case. 2012-12-13 H.J. Lu <hongjiu.lu@intel.com> diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index bb41302..a188cec 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2072,11 +2072,12 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info, /* STT_GNU_IFUNC symbol must go through PLT. */ if (h->type == STT_GNU_IFUNC) { - /* Check local STT_GNU_IFUNC calls. */ + /* All local STT_GNU_IFUNC references must be treate as local + calls via local PLT. */ if (h->ref_regular && SYMBOL_CALLS_LOCAL (info, h)) { - bfd_size_type pc_count = 0; + bfd_size_type pc_count = 0, count = 0; struct elf_dyn_relocs **pp; eh = (struct elf_i386_link_hash_entry *) h; @@ -2085,13 +2086,14 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info, pc_count += p->pc_count; p->count -= p->pc_count; p->pc_count = 0; + count += p->count; if (p->count == 0) *pp = p->next; else pp = &p->next; } - if (pc_count) + if (pc_count || count) { h->needs_plt = 1; h->plt.refcount += 1; diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index ec38ddc..283681c 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2140,11 +2140,12 @@ elf_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info, /* STT_GNU_IFUNC symbol must go through PLT. */ if (h->type == STT_GNU_IFUNC) { - /* Check local STT_GNU_IFUNC calls. */ + /* All local STT_GNU_IFUNC references must be treate as local + calls via local PLT. */ if (h->ref_regular && SYMBOL_CALLS_LOCAL (info, h)) { - bfd_size_type pc_count = 0; + bfd_size_type pc_count = 0, count = 0; struct elf_dyn_relocs **pp; eh = (struct elf_x86_64_link_hash_entry *) h; @@ -2153,13 +2154,14 @@ elf_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info, pc_count += p->pc_count; p->count -= p->pc_count; p->pc_count = 0; + count += p->count; if (p->count == 0) *pp = p->next; else pp = &p->next; } - if (pc_count) + if (pc_count || count) { h->needs_plt = 1; h->plt.refcount += 1; |