From c16153aed7cc77c39bb5e78b2880a9792e1d0554 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 19 Feb 2010 05:07:50 +0000 Subject: Don't set ELFOSABI_LINUX in dynamic ifunc-using executable. bfd/ 2010-02-18 H.J. Lu * elf32-i386.c (elf_i386_add_symbol_hook): Don't set has_ifunc_symbols if the symbol comes from a shared library. * elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise. * elf32-sparc.c (elf32_sparc_add_symbol_hook): Likewise. * elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise. * elf64-sparc.c (elf64_sparc_add_symbol_hook): Likewise. * elf64-x86-64.c (elf64_x86_64_add_symbol_hook): Likewise. ld/testsuite/ 2010-02-18 H.J. Lu * ld-ifunc/ifunc.exp: Expect System V OSABI in dynamic ifunc-using executable. --- bfd/elf32-sparc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bfd/elf32-sparc.c') diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index ab4f703..80102e9 100644 --- a/bfd/elf32-sparc.c +++ b/bfd/elf32-sparc.c @@ -171,7 +171,7 @@ elf32_sparc_reloc_type_class (const Elf_Internal_Rela *rela) file. */ static bfd_boolean -elf32_sparc_add_symbol_hook (bfd * abfd ATTRIBUTE_UNUSED, +elf32_sparc_add_symbol_hook (bfd * abfd, struct bfd_link_info * info ATTRIBUTE_UNUSED, Elf_Internal_Sym * sym, const char ** namep ATTRIBUTE_UNUSED, @@ -179,7 +179,8 @@ elf32_sparc_add_symbol_hook (bfd * abfd ATTRIBUTE_UNUSED, asection ** secp ATTRIBUTE_UNUSED, bfd_vma * valp ATTRIBUTE_UNUSED) { - if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) + if ((abfd->flags & DYNAMIC) == 0 + && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; return TRUE; } -- cgit v1.1