| Message ID | 20210202095846.GA5348@bubble.grove.modra.org |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On Tue, Feb 02, 2021 at 08:28:46PM +1030, Alan Modra wrote: > 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. Eh well, that one introduced a regression with the pr16467 testcases if you happen to be using a compiler that defaults to --as-needed. bfd/ PR 27311 * elflink.c (_bfd_elf_add_default_symbol): Clear override when undecorated symbol will have a different version. ld/ * testsuite/ld-ifunc/ifunc.exp (libpr16467b.so, libpr16467bn.so): Link with --as-needed. diff --git a/bfd/elflink.c b/bfd/elflink.c index 7ac38cac691..5af32ef0a81 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1946,12 +1946,16 @@ _bfd_elf_add_default_symbol (bfd *abfd, if (hi->verinfo.vertree != NULL && hide) { (*bed->elf_backend_hide_symbol) (info, hi, TRUE); + *override = FALSE; goto nondefault; } } if (hi->verinfo.vertree != NULL && strcmp (p + 1 + (p[1] == '@'), hi->verinfo.vertree->name) != 0) - goto nondefault; + { + *override = FALSE; + goto nondefault; + } } if (!*override) diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp index 9d3ace65216..45b47d7d6a8 100644 --- a/ld/testsuite/ld-ifunc/ifunc.exp +++ b/ld/testsuite/ld-ifunc/ifunc.exp @@ -397,7 +397,7 @@ run_cc_link_tests [list \ ] \ [list \ "Build libpr16467b.so" \ - "-shared tmpdir/pr16467b.o tmpdir/libpr16467a.so \ + "-shared -Wl,--as-needed tmpdir/pr16467b.o tmpdir/libpr16467a.so \ -Wl,--version-script=pr16467b.map" \ "-fPIC" \ { dummy.c } \ @@ -422,7 +422,7 @@ run_cc_link_tests [list \ ] \ [list \ "Build libpr16467bn.so" \ - "-shared tmpdir/pr16467b.o tmpdir/libpr16467an.so \ + "-shared -Wl,--as-needed tmpdir/pr16467b.o tmpdir/libpr16467an.so \ -Wl,--version-script=pr16467b.map" \ "-fPIC" \ { dummy.c } \ -- Alan Modra Australia Development Lab, IBM
This:
+ && h->root.type != bfd_link_hash_indirect
does exactly the same as making decisions based on an override in
_bfd_elf_add_default_symbol, and is simpler. I should have written
it this way in the first patch in this series.
PR 27311
* elflink.c (_bfd_elf_add_default_symbol): Revert last two changes.
(elf_link_add_object_symbols): Test for H not an indirect symbol
after calling _bfd_elf_add_default_symbol.
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 5af32ef0a81..82c705015db 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1850,8 +1850,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
asection *sec,
bfd_vma value,
bfd **poldbfd,
- bfd_boolean *dynsym,
- bfd **override)
+ bfd_boolean *dynsym)
{
bfd_boolean type_change_ok;
bfd_boolean size_change_ok;
@@ -1862,7 +1861,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
const struct elf_backend_data *bed;
bfd_boolean collect;
bfd_boolean dynamic;
- bfd *nondef_override;
+ bfd *override;
char *p;
size_t len, shortlen;
asection *tmp_sec;
@@ -1922,7 +1921,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;
@@ -1946,19 +1945,15 @@ _bfd_elf_add_default_symbol (bfd *abfd,
if (hi->verinfo.vertree != NULL && hide)
{
(*bed->elf_backend_hide_symbol) (info, hi, TRUE);
- *override = FALSE;
goto nondefault;
}
}
if (hi->verinfo.vertree != NULL
&& strcmp (p + 1 + (p[1] == '@'), hi->verinfo.vertree->name) != 0)
- {
- *override = FALSE;
- goto nondefault;
- }
+ goto nondefault;
}
- if (!*override)
+ if (!override)
{
/* Add the default symbol if not performing a relocatable link. */
if (! bfd_link_relocatable (info))
@@ -2085,7 +2080,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, &nondef_override,
+ &hi, poldbfd, NULL, NULL, &skip, &override,
&type_change_ok, &size_change_ok, &matched))
return FALSE;
@@ -2109,7 +2104,7 @@ _bfd_elf_add_default_symbol (bfd *abfd,
else
return TRUE;
}
- else if (nondef_override)
+ else if (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
@@ -5094,8 +5089,7 @@ 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,
- &override))
+ sec, value, &old_bfd, &dynsym))
goto error_free_vers;
/* Check the alignment when a common symbol is involved. This
@@ -5278,9 +5272,9 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
}
if (!add_needed
- && !override
&& matched
&& definition
+ && h->root.type != bfd_link_hash_indirect
&& ((dynsym
&& h->ref_regular_nonweak)
|| (old_bfd != NULL
--
Alan Modra
Australia Development Lab, IBM
diff --git a/bfd/elflink.c b/bfd/elflink.c index 3a3ca3b04f7..7ac38cac691 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/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index dbda6c4465d..324adcd00ce 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 00000000000..debf41cdc7f --- /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 00000000000..324daf0c5b6 --- /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 00000000000..314984781db --- /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 00000000000..ed9c8a7048e --- /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 00000000000..6712499130e --- /dev/null +++ b/ld/testsuite/ld-plugin/pr27311c.c @@ -0,0 +1,5 @@ +void inlib1(void) {} +int main() +{ + return 0; +}