From 9918bff7cf2a566aaa2036d2242a61c140652dc7 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 2 Feb 2021 15:05:14 +1030 Subject: PR27311, ld.bfd (symbol from plugin): undefined reference A default versioned symbol definition in a shared library is overridden by an unversioned definition in a regular object file, and thus should not be reason to make an as-needed library needed. bfd/ PR 27311 * elflink.c (_bfd_elf_add_default_symbol): Add override parameter. Use when handling default versioned symbol. Rename existing override variable to nondef_override and use for non-default versioned symbol. (elf_link_add_object_symbols): Adjust call to suit. Don't pull in as-needed libraries when override is set. ld/ * testsuite/ld-plugin/pr27311.d, * testsuite/ld-plugin/pr27311.ver, * testsuite/ld-plugin/pr27311a.c, * testsuite/ld-plugin/pr27311b.c, * testsuite/ld-plugin/pr27311c.c: New testcase. * testsuite/ld-plugin/lto.exp: Run it. Correct PR14918 and PR12982 entries. --- bfd/ChangeLog | 10 ++++++++++ bfd/elflink.c | 17 ++++++++++------- ld/ChangeLog | 10 ++++++++++ ld/testsuite/ld-plugin/lto.exp | 22 ++++++++++++++++------ ld/testsuite/ld-plugin/pr27311.d | 4 ++++ ld/testsuite/ld-plugin/pr27311.ver | 3 +++ ld/testsuite/ld-plugin/pr27311a.c | 1 + ld/testsuite/ld-plugin/pr27311b.c | 1 + ld/testsuite/ld-plugin/pr27311c.c | 5 +++++ 9 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 ld/testsuite/ld-plugin/pr27311.d create mode 100644 ld/testsuite/ld-plugin/pr27311.ver create mode 100644 ld/testsuite/ld-plugin/pr27311a.c create mode 100644 ld/testsuite/ld-plugin/pr27311b.c create mode 100644 ld/testsuite/ld-plugin/pr27311c.c diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e0fa5a3..d65c56d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,13 @@ +2021-02-02 Alan Modra + + PR 27311 + * elflink.c (_bfd_elf_add_default_symbol): Add override parameter. + Use when handling default versioned symbol. Rename existing + override variable to nondef_override and use for non-default + versioned symbol. + (elf_link_add_object_symbols): Adjust call to suit. Don't + pull in as-needed libraries when override is set. + 2021-02-01 Emery Hemingway * config.bfd: Add *-*-genode* as a target for AArch64 and x86. diff --git a/bfd/elflink.c b/bfd/elflink.c index 3a3ca3b..7ac38ca 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1850,7 +1850,8 @@ _bfd_elf_add_default_symbol (bfd *abfd, asection *sec, bfd_vma value, bfd **poldbfd, - bfd_boolean *dynsym) + bfd_boolean *dynsym, + bfd **override) { bfd_boolean type_change_ok; bfd_boolean size_change_ok; @@ -1861,7 +1862,7 @@ _bfd_elf_add_default_symbol (bfd *abfd, const struct elf_backend_data *bed; bfd_boolean collect; bfd_boolean dynamic; - bfd *override; + bfd *nondef_override; char *p; size_t len, shortlen; asection *tmp_sec; @@ -1921,7 +1922,7 @@ _bfd_elf_add_default_symbol (bfd *abfd, matched = TRUE; tmp_sec = sec; if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value, - &hi, poldbfd, NULL, NULL, &skip, &override, + &hi, poldbfd, NULL, NULL, &skip, override, &type_change_ok, &size_change_ok, &matched)) return FALSE; @@ -1953,7 +1954,7 @@ _bfd_elf_add_default_symbol (bfd *abfd, goto nondefault; } - if (! override) + if (!*override) { /* Add the default symbol if not performing a relocatable link. */ if (! bfd_link_relocatable (info)) @@ -2080,7 +2081,7 @@ _bfd_elf_add_default_symbol (bfd *abfd, size_change_ok = FALSE; tmp_sec = sec; if (!_bfd_elf_merge_symbol (abfd, info, shortname, sym, &tmp_sec, &value, - &hi, poldbfd, NULL, NULL, &skip, &override, + &hi, poldbfd, NULL, NULL, &skip, &nondef_override, &type_change_ok, &size_change_ok, &matched)) return FALSE; @@ -2104,7 +2105,7 @@ _bfd_elf_add_default_symbol (bfd *abfd, else return TRUE; } - else if (override) + else if (nondef_override) { /* Here SHORTNAME is a versioned name, so we don't expect to see the type of override we do in the case above unless it is @@ -5089,7 +5090,8 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) && !(hi != h && hi->versioned == versioned_hidden)) if (!_bfd_elf_add_default_symbol (abfd, info, h, name, isym, - sec, value, &old_bfd, &dynsym)) + sec, value, &old_bfd, &dynsym, + &override)) goto error_free_vers; /* Check the alignment when a common symbol is involved. This @@ -5272,6 +5274,7 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) } if (!add_needed + && !override && matched && definition && ((dynsym diff --git a/ld/ChangeLog b/ld/ChangeLog index 6cf9d70..450137a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,13 @@ +2021-02-02 Alan Modra + + * testsuite/ld-plugin/pr27311.d, + * testsuite/ld-plugin/pr27311.ver, + * testsuite/ld-plugin/pr27311a.c, + * testsuite/ld-plugin/pr27311b.c, + * testsuite/ld-plugin/pr27311c.c: New testcase. + * testsuite/ld-plugin/lto.exp: Run it. Correct PR14918 and + PR12982 entries. + 2021-02-01 Emery Hemingway * configure.tgt: Add *-*-genode* as a target for AArch64 and x86. diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index dbda6c4..324adcd 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -415,6 +415,18 @@ set lto_link_elf_tests [list \ [list {pr26806.so} \ {-shared} {-fpic -O2 -flto} \ {pr26806.c} {{nm {-D} pr26806.d}} {pr26806.so}] \ + [list {pr27311a.so} \ + {-shared -Wl,--version-script=pr27311.ver} {-fPIC} \ + {pr27311a.c} {} {pr27311a.so}] \ + [list {pr27311b.so} \ + {-shared -Wl,--no-as-needed tmpdir/pr27311a.so} {-fPIC} \ + {pr27311b.c} {} {pr27311b.so}] \ + [list {pr27311c.o} \ + {} {-flto} \ + {pr27311c.c} {} {} {c}] \ + [list {pr27311} \ + {tmpdir/pr27311c.o -Wl,--no-as-needed,--rpath-link=. tmpdir/pr27311b.so} {} \ + {dummy.c} {{readelf {--dyn-syms --wide} pr27311.d}} {pr27311}] \ ] # PR 14918 checks that libgcc is not spuriously included in a shared link of @@ -423,11 +435,10 @@ set lto_link_elf_tests [list \ # __aeabi_unwind_cpp_pr0@@GCC_3.5 which is provided by libgcc_s.so.1, so the # test fails. Hence this code to skip the test. if { ! [istarget "arm*-*-*"] } { - lappend lto_link_elf_tests [list \ + lappend lto_link_elf_tests \ [list "PR ld/14918" \ "-flto" "-flto" \ - {pr14918.c} {{"readelf" {-d --wide} "pr14918.d"}} "pr14918.exe" "c"] \ - ] + {pr14918.c} {{"readelf" {-d --wide} "pr14918.d"}} "pr14918.exe" "c"] } # PR 12982 checks that an executable stack is not created by default @@ -435,11 +446,10 @@ if { ! [istarget "arm*-*-*"] } { # executable stack for syscall restarts and signal returns, so we # skip this test for that target. if { ! [istarget "hppa*-*-*"] } { - lappend lto_link_elf_tests [list \ + lappend lto_link_elf_tests \ [list "PR ld/12982" \ "-O2 -flto -fuse-linker-plugin" "-O2 -flto" \ - {pr12982.c} {{"readelf" {-l --wide} "pr12982.d"}} "pr12982.exe"] \ - ] + {pr12982.c} {{"readelf" {-l --wide} "pr12982.d"}} "pr12982.exe"] } # Check final symbols in executables. diff --git a/ld/testsuite/ld-plugin/pr27311.d b/ld/testsuite/ld-plugin/pr27311.d new file mode 100644 index 0000000..debf41c --- /dev/null +++ b/ld/testsuite/ld-plugin/pr27311.d @@ -0,0 +1,4 @@ +#failif +#... +.* _*inlib1.* +#... diff --git a/ld/testsuite/ld-plugin/pr27311.ver b/ld/testsuite/ld-plugin/pr27311.ver new file mode 100644 index 0000000..324daf0 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr27311.ver @@ -0,0 +1,3 @@ +LIBFOO { + *; +}; diff --git a/ld/testsuite/ld-plugin/pr27311a.c b/ld/testsuite/ld-plugin/pr27311a.c new file mode 100644 index 0000000..3149847 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr27311a.c @@ -0,0 +1 @@ +void inlib1(void) {} diff --git a/ld/testsuite/ld-plugin/pr27311b.c b/ld/testsuite/ld-plugin/pr27311b.c new file mode 100644 index 0000000..ed9c8a7 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr27311b.c @@ -0,0 +1 @@ +void inlib2(void) {} diff --git a/ld/testsuite/ld-plugin/pr27311c.c b/ld/testsuite/ld-plugin/pr27311c.c new file mode 100644 index 0000000..6712499 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr27311c.c @@ -0,0 +1,5 @@ +void inlib1(void) {} +int main() +{ + return 0; +} -- cgit v1.1