From 2aa90762b71af7f04032d2bebed6470070d3d801 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 1 Mar 2020 17:07:12 -0800 Subject: [PATCH] plugin: Copy the no_export field to the IR dummy object Copy the no_export field to the IR dummy object when claiming an IR object. PR ld/25618 * plugin.c (plugin_object_p): Copy the no_export field to the IR dummy object. * testsuite/ld-plugin/lto.exp (lto_link_elf_tests): Add PR ld/25618 tests. * testsuite/ld-plugin/pr25618.d: New file. * testsuite/ld-plugin/pr25618a.cc: Likewise. * testsuite/ld-plugin/pr25618a.h: Likewise. * testsuite/ld-plugin/pr25618b.cc: Likewise. * testsuite/ld-plugin/pr25618b.h: Likewise. --- ld/ChangeLog | 13 +++++++++++++ ld/plugin.c | 1 + ld/testsuite/ld-plugin/lto.exp | 10 ++++++++++ ld/testsuite/ld-plugin/pr25618.d | 4 ++++ ld/testsuite/ld-plugin/pr25618a.cc | 3 +++ ld/testsuite/ld-plugin/pr25618a.h | 2 ++ ld/testsuite/ld-plugin/pr25618b.cc | 2 ++ ld/testsuite/ld-plugin/pr25618b.h | 2 ++ 8 files changed, 37 insertions(+) create mode 100644 ld/testsuite/ld-plugin/pr25618.d create mode 100644 ld/testsuite/ld-plugin/pr25618a.cc create mode 100644 ld/testsuite/ld-plugin/pr25618a.h create mode 100644 ld/testsuite/ld-plugin/pr25618b.cc create mode 100644 ld/testsuite/ld-plugin/pr25618b.h diff --git a/ld/ChangeLog b/ld/ChangeLog index 118b5c57e1..927074e4ba 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,16 @@ +2020-03-01 H.J. Lu + + PR ld/25618 + * plugin.c (plugin_object_p): Copy the no_export field to the IR + dummy object. + * testsuite/ld-plugin/lto.exp (lto_link_elf_tests): Add + PR ld/25618 tests. + * testsuite/ld-plugin/pr25618.d: New file. + * testsuite/ld-plugin/pr25618a.cc: Likewise. + * testsuite/ld-plugin/pr25618a.h: Likewise. + * testsuite/ld-plugin/pr25618b.cc: Likewise. + * testsuite/ld-plugin/pr25618b.h: Likewise. + 2020-02-27 Alan Modra PR 24511 diff --git a/ld/plugin.c b/ld/plugin.c index 23a314543b..af3f9e2ffe 100644 --- a/ld/plugin.c +++ b/ld/plugin.c @@ -1239,6 +1239,7 @@ plugin_object_p (bfd *ibfd) ibfd->plugin_format = bfd_plugin_yes; ibfd->plugin_dummy_bfd = abfd; bfd_make_readable (abfd); + abfd->no_export = ibfd->no_export; return abfd->xvec; } else diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp index 0243f09328..31da465d00 100644 --- a/ld/testsuite/ld-plugin/lto.exp +++ b/ld/testsuite/ld-plugin/lto.exp @@ -368,6 +368,16 @@ set lto_link_elf_tests [list \ "-O2 -flto -Wl,--as-needed tmpdir/pr25593a-2.o tmpdir/pr25593b.o \ tmpdir/pr25593c.so tmpdir/pr25593d.so tmpdir/pr25593e.so" "" \ {dummy.c} {{readelf {-d --wide} pr25593.d}} "pr25593b.exe"] \ + [list "Build pr25618a.o" \ + "$plug_opt" "-O2 -flto -fpic" \ + {pr25618a.cc} {} "" "c++"] \ + [list "Build pr25618.a" \ + "$plug_opt" "-O2 -flto -fpic" \ + {pr25618b.cc} {} "pr25618.a" "c++"] \ + [list "Build pr25618.so" \ + "-shared -Wl,--exclude-libs,ALL tmpdir/pr25618a.o tmpdir/pr25618.a" \ + "-fpic" \ + {dummy.c} {{readelf {--dyn-syms --wide} pr25618.d}} "pr25618.so" "c++"] \ ] # PR 14918 checks that libgcc is not spuriously included in a shared link of diff --git a/ld/testsuite/ld-plugin/pr25618.d b/ld/testsuite/ld-plugin/pr25618.d new file mode 100644 index 0000000000..2815d928b7 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr25618.d @@ -0,0 +1,4 @@ +#failif +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +_?_Z3foov +#... diff --git a/ld/testsuite/ld-plugin/pr25618a.cc b/ld/testsuite/ld-plugin/pr25618a.cc new file mode 100644 index 0000000000..6d35b3c74a --- /dev/null +++ b/ld/testsuite/ld-plugin/pr25618a.cc @@ -0,0 +1,3 @@ +#include "pr25618a.h" +#include "pr25618b.h" +int bar() { return foo(); } diff --git a/ld/testsuite/ld-plugin/pr25618a.h b/ld/testsuite/ld-plugin/pr25618a.h new file mode 100644 index 0000000000..9bf857ce65 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr25618a.h @@ -0,0 +1,2 @@ +#pragma once +__attribute__((visibility("default"))) int bar(); diff --git a/ld/testsuite/ld-plugin/pr25618b.cc b/ld/testsuite/ld-plugin/pr25618b.cc new file mode 100644 index 0000000000..1d3dff3702 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr25618b.cc @@ -0,0 +1,2 @@ +#include "pr25618b.h" +int foo() { return 100; } diff --git a/ld/testsuite/ld-plugin/pr25618b.h b/ld/testsuite/ld-plugin/pr25618b.h new file mode 100644 index 0000000000..cd80074f47 --- /dev/null +++ b/ld/testsuite/ld-plugin/pr25618b.h @@ -0,0 +1,2 @@ +#pragma once +__attribute__((visibility("default"))) int foo(); -- 2.34.1