This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Properly mark the plugin symbol undefined
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 6 Feb 2015 12:29:45 -0000
- Subject: [binutils-gdb] Properly mark the plugin symbol undefined
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9e2dec471006de3e0489a34fbeb922fee1e302af
commit 9e2dec471006de3e0489a34fbeb922fee1e302af
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Fri Feb 6 04:25:36 2015 -0800
Properly mark the plugin symbol undefined
Mark the unused plugin defined symbol in elf_link_input_bfd instead of
_bfd_elf_fix_symbol_flags. Limit the PR ld/12365 test to x86 targets.
bfd/
PR ld/12365
PR ld/14272
* elflink.c (_bfd_elf_fix_symbol_flags): Revert the last change.
(elf_link_input_bfd): Mark the plugin symbol undefined if it is
referenced from a non-IR file.
ld/testsuite/
PR ld/12365
PR ld/14272
* ld-plugin/lto.exp: Run the PR ld/12365 test only for x86 targets.
* ld-plugin/plugin-7.d: Updated.
* ld-plugin/plugin-8.d: Likewise.
Diff:
---
bfd/ChangeLog | 8 ++++++++
bfd/elflink.c | 30 ++++++++++++++++--------------
ld/testsuite/ChangeLog | 8 ++++++++
ld/testsuite/ld-plugin/lto.exp | 23 +++++++++++++++++------
ld/testsuite/ld-plugin/plugin-7.d | 3 ++-
ld/testsuite/ld-plugin/plugin-8.d | 3 ++-
6 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f12a610..1220455 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-06 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/12365
+ PR ld/14272
+ * elflink.c (_bfd_elf_fix_symbol_flags): Revert the last change.
+ (elf_link_input_bfd): Mark the plugin symbol undefined if it is
+ referenced from a non-IR file.
+
2015-02-06 Nick Clifton <nickc@redhat.com>
PR binutils/17512
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 604cfb6..e8c4ad4 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -2423,20 +2423,6 @@ _bfd_elf_fix_symbol_flags (struct elf_link_hash_entry *h,
}
else
{
- /* If a plugin symbol is referenced from a non-IR file, mark
- the symbol as undefined, except for symbol for linker
- created section. */
- if (h->root.non_ir_ref
- && (h->root.type == bfd_link_hash_defined
- || h->root.type == bfd_link_hash_defweak)
- && (h->root.u.def.section->flags & SEC_LINKER_CREATED) == 0
- && h->root.u.def.section->owner != NULL
- && (h->root.u.def.section->owner->flags & BFD_PLUGIN) != 0)
- {
- h->root.type = bfd_link_hash_undefined;
- h->root.u.undef.abfd = h->root.u.def.section->owner;
- }
-
/* Unfortunately, NON_ELF is only correct if the symbol
was first seen in a non-ELF file. Fortunately, if the symbol
was first seen in an ELF file, we're probably OK unless the
@@ -9807,6 +9793,22 @@ elf_link_input_bfd (struct elf_final_link_info *flinfo, bfd *input_bfd)
s_type = h->type;
+ /* If a plugin symbol is referenced from a non-IR file,
+ mark the symbol as undefined, except for symbol for
+ linker created section. */
+ if (h->root.non_ir_ref
+ && (h->root.type == bfd_link_hash_defined
+ || h->root.type == bfd_link_hash_defweak)
+ && (h->root.u.def.section->flags
+ & SEC_LINKER_CREATED) == 0
+ && h->root.u.def.section->owner != NULL
+ && (h->root.u.def.section->owner->flags
+ & BFD_PLUGIN) != 0)
+ {
+ h->root.type = bfd_link_hash_undefined;
+ h->root.u.undef.abfd = h->root.u.def.section->owner;
+ }
+
ps = NULL;
if (h->root.type == bfd_link_hash_defined
|| h->root.type == bfd_link_hash_defweak)
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 1041bd1..075016b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-06 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/12365
+ PR ld/14272
+ * ld-plugin/lto.exp: Run the PR ld/12365 test only for x86 targets.
+ * ld-plugin/plugin-7.d: Updated.
+ * ld-plugin/plugin-8.d: Likewise.
+
2015-02-04 H.J. Lu <hongjiu.lu@intel.com>
* ld-plugin/lto.exp: Pass -flto-partition=none to the PR
diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
index 065e1bb..6d9500b 100644
--- a/ld/testsuite/ld-plugin/lto.exp
+++ b/ld/testsuite/ld-plugin/lto.exp
@@ -383,12 +383,23 @@ if {![string match "" $catch_output]} {
if { [at_least_gcc_version 4 7] } {
# Check expected LTO linker errors.
- set testname "PR ld/12365"
- set exec_output [run_host_cmd "$CC" "-O2 -flto -flto-partition=none -fuse-linker-plugin tmpdir/pr12365a.o tmpdir/pr12365b.o tmpdir/pr12365c.o"]
- if { [ regexp "undefined reference to `my_bcopy'" $exec_output ] } {
- pass $testname
- } {
- fail $testname
+ # Since the asm symbol name hack in pr12365b.c doesn't work on all
+ # targets, run PR ld/12365 tests only for known targets.
+ if { ([istarget "i?86-*-elf*"]
+ || (([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"])
+ && ![istarget "*-*-*aout*"]
+ && ![istarget "*-*-*oldld*"])
+ || [istarget "i?86-*-nacl*"]
+ || [istarget "x86_64-*-nacl*"]
+ || [istarget "x86_64-*-linux*"]
+ || [istarget "amd64-*-linux*"]) } {
+ set testname "PR ld/12365"
+ set exec_output [run_host_cmd "$CC" "-O2 -flto -flto-partition=none -fuse-linker-plugin tmpdir/pr12365a.o tmpdir/pr12365b.o tmpdir/pr12365c.o"]
+ if { [ regexp "undefined reference to `my_bcopy'" $exec_output ] } {
+ pass $testname
+ } {
+ fail $testname
+ }
}
set testname "PR ld/12942 (3)"
set exec_output [run_host_cmd "$CXX" "-O2 -flto -fuse-linker-plugin tmpdir/pr12942b.o tmpdir/pr12942a.o"]
diff --git a/ld/testsuite/ld-plugin/plugin-7.d b/ld/testsuite/ld-plugin/plugin-7.d
index 28a7036..d1c159c 100644
--- a/ld/testsuite/ld-plugin/plugin-7.d
+++ b/ld/testsuite/ld-plugin/plugin-7.d
@@ -28,6 +28,7 @@ hook called: claim_file tmpdir/func.o \[@0/.* CLAIMED
hook called: claim_file tmpdir/text.o \[@0/.* not claimed
#...
hook called: all symbols read.
-`_?func' referenced in section `\.text.*' of tmpdir/main.o: defined in discarded section .*
+tmpdir/main.o: In function `main':
+.*main.c.*: undefined reference to `func'
hook called: cleanup.
#...
diff --git a/ld/testsuite/ld-plugin/plugin-8.d b/ld/testsuite/ld-plugin/plugin-8.d
index 8170b54..2c7a15b 100644
--- a/ld/testsuite/ld-plugin/plugin-8.d
+++ b/ld/testsuite/ld-plugin/plugin-8.d
@@ -32,6 +32,7 @@ hook called: claim_file tmpdir/text.o \[@0/.* not claimed
hook called: all symbols read.
Sym: '_?func' Resolution: LDPR_PREVAILING_DEF
Sym: '_?func2' Resolution: LDPR_PREVAILING_DEF_IRONLY
-`_?func' referenced in section `\.text.*' of tmpdir/main.o: defined in discarded section .*
+tmpdir/main.o: In function `main':
+.*main.c.*: undefined reference to `func'
hook called: cleanup.
#...