x86: Also check x86 linker_def for non-shared definition

Since elf_x86_linker_defined sets linker_def in elf_x86_link_hash_entry
for linker defined symbols, SYMBOL_DEFINED_NON_SHARED_P should also check
linker_def in elf_x86_link_hash_entry.

bfd/

	PR ld/24458
	* elfxx-x86.h (SYMBOL_DEFINED_NON_SHARED_P): Also check x86
	linker_def.

ld/

	PR ld/24458
	* testsuite/ld-x86-64/x86-64.exp: Run PR ld/24458 tests.
	* testsuite/ld-x86-64/pr24458.s: New file.
	* testsuite/ld-x86-64/pr24458a-x32.d: Likewise.
	* testsuite/ld-x86-64/pr24458a.d: Likewise.
	* testsuite/ld-x86-64/pr24458b-x32.d: Likewise.
	* testsuite/ld-x86-64/pr24458b.d: Likewise.
	* testsuite/ld-x86-64/pr24458c-x32.d: Likewise.
	* testsuite/ld-x86-64/pr24458c.d: Likewise.

(cherry picked from commit 4e84a8f8bbeab52fa7048873655e582ceb92534d)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index eb32e2dd679347e5c623e4fb76c1a378dc0608f9..4af15327dbf3d68a3aa3da894c1a6c36c5d4a3ac 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/24458
+       * elfxx-x86.h (SYMBOL_DEFINED_NON_SHARED_P): Also check x86
+       linker_def.
+
 2019-03-18  Alan Modra  <amodra@gmail.com>
 
        PR 24355

diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h
index 1f757fda0c152a887a43f66e23284c9adda34658..d9af0980410f3925869bd5b24e4286bd6fd6f9cf 100644 (file)
--- a/bfd/elfxx-x86.h
+++ b/bfd/elfxx-x86.h
@@ -167,6 +167,7 @@
   ((H)->def_regular \
    || (H)->root.linker_def \
    || (H)->root.ldscript_def \
+   || ((struct elf_x86_link_hash_entry *) (H))->linker_def \
    || ELF_COMMON_DEF_P (H))
 
 /* TRUE if relative relocation should be generated.  GOT reference to

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 00c0785ede9eee7ecd23899a089b50b1b411f4ae..df78b1ce375171b26333efdaea5bdc749e23211b 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,15 @@
+2019-04-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/24458
+       * testsuite/ld-x86-64/x86-64.exp: Run PR ld/24458 tests.
+       * testsuite/ld-x86-64/pr24458.s: New file.
+       * testsuite/ld-x86-64/pr24458a-x32.d: Likewise.
+       * testsuite/ld-x86-64/pr24458a.d: Likewise.
+       * testsuite/ld-x86-64/pr24458b-x32.d: Likewise.
+       * testsuite/ld-x86-64/pr24458b.d: Likewise.
+       * testsuite/ld-x86-64/pr24458c-x32.d: Likewise.
+       * testsuite/ld-x86-64/pr24458c.d: Likewise.
+
 2019-02-10  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/24151

diff --git a/ld/testsuite/ld-x86-64/pr24458.s b/ld/testsuite/ld-x86-64/pr24458.s
new file mode 100644 (file)
index 0000000..7dbd47a
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458.s
@@ -0,0 +1,5 @@
+       .text
+       .globl  _start
+       .type   _start, @function
+_start:
+       movq    __ehdr_start(%rip), %rax

diff --git a/ld/testsuite/ld-x86-64/pr24458a-x32.d b/ld/testsuite/ld-x86-64/pr24458a-x32.d
new file mode 100644 (file)
index 0000000..9b58786
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458a-x32.d
@@ -0,0 +1,5 @@
+#source: pr24458.s
+#as: --x32
+#ld: -m elf32_x86_64
+#readelf: -n
+#pass

diff --git a/ld/testsuite/ld-x86-64/pr24458a.d b/ld/testsuite/ld-x86-64/pr24458a.d
new file mode 100644 (file)
index 0000000..d14f66d
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458a.d
@@ -0,0 +1,5 @@
+#source: pr24458.s
+#as: --64
+#ld: -m elf_x86_64
+#readelf: -n
+#pass

diff --git a/ld/testsuite/ld-x86-64/pr24458b-x32.d b/ld/testsuite/ld-x86-64/pr24458b-x32.d
new file mode 100644 (file)
index 0000000..fa7950e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458b-x32.d
@@ -0,0 +1,5 @@
+#source: pr24458.s
+#as: --x32
+#ld: -pie -m elf32_x86_64
+#readelf: -n
+#pass

diff --git a/ld/testsuite/ld-x86-64/pr24458b.d b/ld/testsuite/ld-x86-64/pr24458b.d
new file mode 100644 (file)
index 0000000..8c0b534
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458b.d
@@ -0,0 +1,5 @@
+#source: pr24458.s
+#as: --64
+#ld: -pie -m elf_x86_64
+#readelf: -n
+#pass

diff --git a/ld/testsuite/ld-x86-64/pr24458c-x32.d b/ld/testsuite/ld-x86-64/pr24458c-x32.d
new file mode 100644 (file)
index 0000000..344228f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458c-x32.d
@@ -0,0 +1,5 @@
+#source: pr24458.s
+#as: --x32
+#ld: -shared -m elf32_x86_64
+#readelf: -n
+#pass

diff --git a/ld/testsuite/ld-x86-64/pr24458c.d b/ld/testsuite/ld-x86-64/pr24458c.d
new file mode 100644 (file)
index 0000000..1bc3de3
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458c.d
@@ -0,0 +1,5 @@
+#source: pr24458.s
+#as: --64
+#ld: -shared -m elf_x86_64
+#readelf: -n
+#pass

diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index ac41d8ea49101a28e6fbc971a479a73aab9def8b..e6d9979d7ccb90ccf050543517bd199cb2f43934 100644 (file)
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -410,6 +410,12 @@ run_dump_test "pr23486b-x32"
 run_dump_test "pr23854"
 run_dump_test "pr24151a"
 run_dump_test "pr24151a-x32"
+run_dump_test "pr24458a"
+run_dump_test "pr24458a-x32"
+run_dump_test "pr24458b"
+run_dump_test "pr24458b-x32"
+run_dump_test "pr24458c"
+run_dump_test "pr24458c-x32"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return