Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog6
-rw-r--r--bfd/elfxx-x86.h1
-rw-r--r--ld/ChangeLog12
-rw-r--r--ld/testsuite/ld-x86-64/pr24458.s5
-rw-r--r--ld/testsuite/ld-x86-64/pr24458a-x32.d10
-rw-r--r--ld/testsuite/ld-x86-64/pr24458a.d10
-rw-r--r--ld/testsuite/ld-x86-64/pr24458b-x32.d10
-rw-r--r--ld/testsuite/ld-x86-64/pr24458b.d10
-rw-r--r--ld/testsuite/ld-x86-64/pr24458c-x32.d10
-rw-r--r--ld/testsuite/ld-x86-64/pr24458c.d10
-rw-r--r--ld/testsuite/ld-x86-64/x86-64.exp6
11 files changed, 90 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6433e46e425..45255c0168a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-17 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-25 Claudiu Zissulescu <claziss@synopsys.com>
Backport from mainline
diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h
index 28d540b83b3..610b2f3a689 100644
--- a/bfd/elfxx-x86.h
+++ b/bfd/elfxx-x86.h
@@ -166,6 +166,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 192599f71db..f4b12a2f0a8 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,15 @@
+2019-04-17 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-04-01 Tamar Christina <tamar.christina@arm.com>
* testsuite/ld-arm/jump-reloc-veneers-cond-long.d: Update disassembly.
diff --git a/ld/testsuite/ld-x86-64/pr24458.s b/ld/testsuite/ld-x86-64/pr24458.s
new file mode 100644
index 00000000000..7dbd47af63f
--- /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
index 00000000000..ae3994a5574
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458a-x32.d
@@ -0,0 +1,10 @@
+#source: pr24458.s
+#as: --x32 -mx86-used-note=yes
+#ld: -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+ Owner Data size Description
+ GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
+ Properties: x86 ISA used: <None>
+ x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24458a.d b/ld/testsuite/ld-x86-64/pr24458a.d
new file mode 100644
index 00000000000..9e2e8b09798
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458a.d
@@ -0,0 +1,10 @@
+#source: pr24458.s
+#as: --64 -mx86-used-note=yes
+#ld: -m elf_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+ Owner Data size Description
+ GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
+ Properties: x86 ISA used: <None>
+ x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24458b-x32.d b/ld/testsuite/ld-x86-64/pr24458b-x32.d
new file mode 100644
index 00000000000..57d10ab11ef
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458b-x32.d
@@ -0,0 +1,10 @@
+#source: pr24458.s
+#as: --x32 -mx86-used-note=yes
+#ld: -pie -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+ Owner Data size Description
+ GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
+ Properties: x86 ISA used: <None>
+ x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24458b.d b/ld/testsuite/ld-x86-64/pr24458b.d
new file mode 100644
index 00000000000..bdcc79a3418
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458b.d
@@ -0,0 +1,10 @@
+#source: pr24458.s
+#as: --64 -mx86-used-note=yes
+#ld: -pie -m elf_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+ Owner Data size Description
+ GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
+ Properties: x86 ISA used: <None>
+ x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24458c-x32.d b/ld/testsuite/ld-x86-64/pr24458c-x32.d
new file mode 100644
index 00000000000..4d766364045
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458c-x32.d
@@ -0,0 +1,10 @@
+#source: pr24458.s
+#as: --x32 -mx86-used-note=yes
+#ld: -shared -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+ Owner Data size Description
+ GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
+ Properties: x86 ISA used: <None>
+ x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24458c.d b/ld/testsuite/ld-x86-64/pr24458c.d
new file mode 100644
index 00000000000..e2998316818
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24458c.d
@@ -0,0 +1,10 @@
+#source: pr24458.s
+#as: --64 -mx86-used-note=yes
+#ld: -shared -m elf_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+ Owner Data size Description
+ GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0
+ Properties: x86 ISA used: <None>
+ x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 5eb556515fa..9a76486fbcf 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -426,6 +426,12 @@ run_dump_test "pr23930"
run_dump_test "pr23930-x32"
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