From c16153aed7cc77c39bb5e78b2880a9792e1d0554 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 19 Feb 2010 05:07:50 +0000 Subject: [PATCH] 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/ChangeLog | 10 ++++++++++ bfd/elf32-i386.c | 5 +++-- bfd/elf32-ppc.c | 3 ++- bfd/elf32-sparc.c | 5 +++-- bfd/elf64-ppc.c | 7 +++++-- bfd/elf64-sparc.c | 3 ++- bfd/elf64-x86-64.c | 3 ++- ld/testsuite/ChangeLog | 5 +++++ ld/testsuite/ld-ifunc/ifunc.exp | 4 ++-- 9 files changed, 34 insertions(+), 11 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a09058aa57f..7ff3959115a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +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. + 2010-02-19 Alan Modra * elf.c (_bfd_elf_fixup_group_sections): New function, split out from.. diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index e2cdbf7c2b9..6ec2c2e7e21 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -4620,7 +4620,7 @@ elf_i386_hash_symbol (struct elf_link_hash_entry *h) file. */ static bfd_boolean -elf_i386_add_symbol_hook (bfd * abfd ATTRIBUTE_UNUSED, +elf_i386_add_symbol_hook (bfd * abfd, struct bfd_link_info * info ATTRIBUTE_UNUSED, Elf_Internal_Sym * sym, const char ** namep ATTRIBUTE_UNUSED, @@ -4628,7 +4628,8 @@ elf_i386_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; diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 36674130e93..6e4cbc1238e 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -3113,7 +3113,8 @@ ppc_elf_add_symbol_hook (bfd *abfd, *valp = sym->st_size; } - 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; diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c index ab4f70374cc..80102e9284f 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; } diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index 90d1b9f810c..ffd37dd63fd 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -4557,7 +4557,7 @@ make_fdh (struct bfd_link_info *info, function type. */ static bfd_boolean -ppc64_elf_add_symbol_hook (bfd *ibfd ATTRIBUTE_UNUSED, +ppc64_elf_add_symbol_hook (bfd *ibfd, struct bfd_link_info *info, Elf_Internal_Sym *isym, const char **name ATTRIBUTE_UNUSED, @@ -4566,7 +4566,10 @@ ppc64_elf_add_symbol_hook (bfd *ibfd ATTRIBUTE_UNUSED, bfd_vma *value ATTRIBUTE_UNUSED) { if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC) - elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; + { + if ((ibfd->flags & DYNAMIC) == 0) + elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; + } else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC) ; else if (*sec != NULL diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c index a1bde20903d..5a2fda26840 100644 --- a/bfd/elf64-sparc.c +++ b/bfd/elf64-sparc.c @@ -424,7 +424,8 @@ elf64_sparc_add_symbol_hook (bfd *abfd, struct bfd_link_info *info, { static const char *const stt_types[] = { "NOTYPE", "OBJECT", "FUNCTION" }; - 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; if (ELF_ST_TYPE (sym->st_info) == STT_REGISTER) diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 9459b9ca069..373a8da1c0b 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -4257,7 +4257,8 @@ elf64_x86_64_add_symbol_hook (bfd *abfd, break; } - 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; diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index e170dfc836c..a4b21006040 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-02-18 H.J. Lu + + * ld-ifunc/ifunc.exp: Expect System V OSABI in dynamic + ifunc-using executable. + 2010-02-19 Alan Modra * ld-elf/group.ld: Discard .dropme sections. diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index be519ce456d..38fe2d39046 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -258,8 +258,8 @@ if {! [check_osabi tmpdir/static_prog {UNIX - Linux}]} { fail "Static ifunc-using executable does not have an OS/ABI field of LINUX" set fails [expr $fails + 1] } -if {! [check_osabi tmpdir/dynamic_prog {UNIX - Linux}]} { - fail "Dynamic ifunc-using executable does not have an OS/ABI field of LINUX" +if {! [check_osabi tmpdir/dynamic_prog {UNIX - System V}]} { + fail "Dynamic ifunc-using executable does not have an OS/ABI field of System V" set fails [expr $fails + 1] } if {! [check_osabi tmpdir/static_nonifunc_prog {UNIX - System V}]} { -- 2.30.2