diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elflink.c | 10 | ||||
| -rw-r--r-- | ld/ChangeLog | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-plugin/lto.exp | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-plugin/pr22220.h | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-plugin/pr22220lib.cc | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-plugin/pr22220lib.ver | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-plugin/pr22220main.cc | 12 |
8 files changed, 63 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b0870df..a376ed3 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -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 Alan Modra <amodra@gmail.com> Apply from master diff --git a/bfd/elflink.c b/bfd/elflink.c index 7e960cc..7a800a9 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1223,6 +1223,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. */ diff --git a/ld/ChangeLog b/ld/ChangeLog index d9db80e..67830b9 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -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-27 Alan Modra <amodra@gmail.com> Apply from master diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index 3e6005d..04e4eea 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -288,6 +288,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. @@ -389,6 +395,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 diff --git a/ld/testsuite/ld-plugin/pr22220.h b/ld/testsuite/ld-plugin/pr22220.h new file mode 100644 index 0000000..b15b45c --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22220.h @@ -0,0 +1,8 @@ +extern int doo(); + +inline int *goo() { + static int xyz; + return &xyz; +} + +int *boo(); diff --git a/ld/testsuite/ld-plugin/pr22220lib.cc b/ld/testsuite/ld-plugin/pr22220lib.cc new file mode 100644 index 0000000..771f44f --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22220lib.cc @@ -0,0 +1,6 @@ +#include "pr22220.h" + +int* boo() +{ + return goo (); +} diff --git a/ld/testsuite/ld-plugin/pr22220lib.ver b/ld/testsuite/ld-plugin/pr22220lib.ver new file mode 100644 index 0000000..6da7e1a --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22220lib.ver @@ -0,0 +1 @@ +BAR { global: *; }; diff --git a/ld/testsuite/ld-plugin/pr22220main.cc b/ld/testsuite/ld-plugin/pr22220main.cc new file mode 100644 index 0000000..38c206f --- /dev/null +++ b/ld/testsuite/ld-plugin/pr22220main.cc @@ -0,0 +1,12 @@ +#include <stdio.h> +#include "pr22220.h" + +int main() +{ + if (boo() == goo()) + { + printf ("PASS\n"); + return 0; + } + return 1; +} |