PR22220, BFD linker wrongly marks symbols as PREVAILING_DEF_IRONLY
non_ir_ref_dynamic wasn't being set in the case where we have a versioned dynamic symbol definition with a non-versioned matching IR symbol. bfd/ PR 22220 * elflink.c (_bfd_elf_merge_symbol): Set non_ir_ref_dynamic in a case where plugin_notice isn't called. ld/ * testsuite/ld-plugin/pr22220.h, * testsuite/ld-plugin/pr22220lib.cc, * testsuite/ld-plugin/pr22220lib.ver, * testsuite/ld-plugin/pr22220main.cc: New test. * testsuite/ld-plugin/lto.exp: Run it.
This commit is contained in:
parent
50300765aa
commit
1a3b5c34fe
@ -1,3 +1,9 @@
|
||||
2017-09-28 Alan Modra <amodra@gmail.com>
|
||||
|
||||
PR 22220
|
||||
* elflink.c (_bfd_elf_merge_symbol): Set non_ir_ref_dynamic in
|
||||
a case where plugin_notice isn't called.
|
||||
|
||||
2017-09-27 Kuan-Lin Chen <kuanlinchentw@gmail.com>
|
||||
|
||||
* elf32-nds32.c (nds32_elf_relax_section): Fix a tautological
|
||||
|
@ -1234,6 +1234,16 @@ _bfd_elf_merge_symbol (bfd *abfd,
|
||||
olddyn = (oldsec->symbol->flags & BSF_DYNAMIC) != 0;
|
||||
}
|
||||
|
||||
/* Handle a case where plugin_notice won't be called and thus won't
|
||||
set the non_ir_ref flags on the first pass over symbols. */
|
||||
if (oldbfd != NULL
|
||||
&& (oldbfd->flags & BFD_PLUGIN) != (abfd->flags & BFD_PLUGIN)
|
||||
&& newdyn != olddyn)
|
||||
{
|
||||
h->root.non_ir_ref_dynamic = TRUE;
|
||||
hi->root.non_ir_ref_dynamic = TRUE;
|
||||
}
|
||||
|
||||
/* NEWDEF and OLDDEF indicate whether the new or old symbol,
|
||||
respectively, appear to be a definition rather than reference. */
|
||||
|
||||
|
@ -1,3 +1,11 @@
|
||||
2017-09-28 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* testsuite/ld-plugin/pr22220.h,
|
||||
* testsuite/ld-plugin/pr22220lib.cc,
|
||||
* testsuite/ld-plugin/pr22220lib.ver,
|
||||
* testsuite/ld-plugin/pr22220main.cc: New test.
|
||||
* testsuite/ld-plugin/lto.exp: Run it.
|
||||
|
||||
2017-09-26 Maciej W. Rozycki <macro@imgtec.com>
|
||||
|
||||
* testsuite/ld-undefined/undefined.exp: Correct the dyn reloc
|
||||
|
@ -295,6 +295,12 @@ set lto_link_elf_tests [list \
|
||||
[list "Build pr21382.so" \
|
||||
"-shared" "-O2 -fpic" \
|
||||
{pr21382b.c} {} "pr21382.so" "c"] \
|
||||
[list {Build pr22220lib.so} \
|
||||
{-shared -Wl,--version-script=pr22220lib.ver} {-fPIC} \
|
||||
{pr22220lib.cc} {} {pr22220lib.so} {c++}] \
|
||||
[list {Build pr22220main.o} \
|
||||
{} {-flto} \
|
||||
{pr22220main.cc} {} {} {c++}] \
|
||||
]
|
||||
|
||||
# Check final symbols in executables.
|
||||
@ -396,6 +402,12 @@ set lto_run_elf_shared_tests [list \
|
||||
[list "Run pr21382" \
|
||||
"-O2 -flto -fuse-linker-plugin -Wl,--as-needed tmpdir/pr21382a.o tmpdir/pr21382.so" "" \
|
||||
{dummy.c} "pr21382.exe" "pass.out" "" "c"] \
|
||||
[list {pr22220a} \
|
||||
{-flto -fuse-linker-plugin tmpdir/pr22220main.o tmpdir/pr22220lib.so} {} \
|
||||
{dummy.c} {pr22220a.exe} {pass.out} {} {c++}] \
|
||||
[list {pr22220b} \
|
||||
{-flto -fuse-linker-plugin -Wl,--no-as-needed tmpdir/pr22220lib.so tmpdir/pr22220main.o} {} \
|
||||
{dummy.c} {pr22220b.exe} {pass.out} {} {c++}] \
|
||||
]
|
||||
|
||||
# LTO run-time tests for ELF
|
||||
|
8
ld/testsuite/ld-plugin/pr22220.h
Normal file
8
ld/testsuite/ld-plugin/pr22220.h
Normal file
@ -0,0 +1,8 @@
|
||||
extern int doo();
|
||||
|
||||
inline int *goo() {
|
||||
static int xyz;
|
||||
return &xyz;
|
||||
}
|
||||
|
||||
int *boo();
|
6
ld/testsuite/ld-plugin/pr22220lib.cc
Normal file
6
ld/testsuite/ld-plugin/pr22220lib.cc
Normal file
@ -0,0 +1,6 @@
|
||||
#include "pr22220.h"
|
||||
|
||||
int* boo()
|
||||
{
|
||||
return goo ();
|
||||
}
|
1
ld/testsuite/ld-plugin/pr22220lib.ver
Normal file
1
ld/testsuite/ld-plugin/pr22220lib.ver
Normal file
@ -0,0 +1 @@
|
||||
BAR { global: *; };
|
12
ld/testsuite/ld-plugin/pr22220main.cc
Normal file
12
ld/testsuite/ld-plugin/pr22220main.cc
Normal file
@ -0,0 +1,12 @@
|
||||
#include <stdio.h>
|
||||
#include "pr22220.h"
|
||||
|
||||
int main()
|
||||
{
|
||||
if (boo() == goo())
|
||||
{
|
||||
printf ("PASS\n");
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
Loading…
Reference in New Issue
Block a user