From: H.J. Lu Date: Thu, 20 Dec 2012 18:52:21 +0000 (+0000) Subject: Also check local IFUNC references X-Git-Tag: binutils-2_23_2~127 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b13bbd07baaf67a0bc49354549541d76bd0224f;p=thirdparty%2Fbinutils-gdb.git 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. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index cfa358ca662..ce91c412de6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-12-20 H.J. Lu + + 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-20 H.J. Lu PR ld/14956 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 987416c57f7..70a0d30de2f 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 9fcf73a72f6..c72d316f8c8 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; diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 7e3bad506c1..21fcbe1d7ed 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,19 @@ +2012-12-20 H.J. Lu + + 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. + 2012-12-20 H.J. Lu PR ld/14956