aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2019-06-24 11:08:40 -0700
committerH.J. Lu <hjl.tools@gmail.com>2019-06-24 11:08:57 -0700
commitf93ab3a0b8039a1667a666f013cca50b03d67f9b (patch)
tree21a6d5b3201ec8ac98a911549a7da13fa960115b /ld
parent164e3873cf41d01a9a67396575dceef7489cee64 (diff)
downloadgdb-f93ab3a0b8039a1667a666f013cca50b03d67f9b.zip
gdb-f93ab3a0b8039a1667a666f013cca50b03d67f9b.tar.gz
gdb-f93ab3a0b8039a1667a666f013cca50b03d67f9b.tar.bz2
elf: Remove the property after reporting its removal
commit d2ef37ebd9f771d06edf1fdea37970f60b242b2d Author: H.J. Lu <hjl.tools@gmail.com> Date: Fri Dec 7 08:30:30 2018 -0800 elf: Report property change when merging properties failed to remove the property after reporting it has been removed. This patch corrects it. bfd/ PR ld/24721 * elf-properties.c (elf_merge_gnu_property_list): Remove the property after reporting property removal. ld/ PR ld/24721 * testsuite/ld-x86-64/x86-64.exp: Run PR ld/24721 tests. * testsuite/ld-x86-64/pr24721-x32.d: New file. * testsuite/ld-x86-64/pr24721.d: Likewise. * testsuite/ld-x86-64/pr24721.map: Likewise. * testsuite/ld-x86-64/pr24721a.s: Likewise. * testsuite/ld-x86-64/pr24721b.s: Likewise.
Diffstat (limited to 'ld')
-rw-r--r--ld/ChangeLog10
-rw-r--r--ld/testsuite/ld-x86-64/pr24721-x32.d6
-rw-r--r--ld/testsuite/ld-x86-64/pr24721.d6
-rw-r--r--ld/testsuite/ld-x86-64/pr24721.map3
-rw-r--r--ld/testsuite/ld-x86-64/pr24721a.s34
-rw-r--r--ld/testsuite/ld-x86-64/pr24721b.s6
-rw-r--r--ld/testsuite/ld-x86-64/x86-64.exp2
7 files changed, 67 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6dcfe30..2c11a66 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2019-06-24 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/24721
+ * testsuite/ld-x86-64/x86-64.exp: Run PR ld/24721 tests.
+ * testsuite/ld-x86-64/pr24721-x32.d: New file.
+ * testsuite/ld-x86-64/pr24721.d: Likewise.
+ * testsuite/ld-x86-64/pr24721.map: Likewise.
+ * testsuite/ld-x86-64/pr24721a.s: Likewise.
+ * testsuite/ld-x86-64/pr24721b.s: Likewise.
+
2019-06-23 Alan Modra <amodra@gmail.com>
PR 24704
diff --git a/ld/testsuite/ld-x86-64/pr24721-x32.d b/ld/testsuite/ld-x86-64/pr24721-x32.d
new file mode 100644
index 0000000..9b067ef
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24721-x32.d
@@ -0,0 +1,6 @@
+#source: pr24721a.s
+#source: pr24721b.s
+#as: --x32 -mx86-used-note=no
+#ld: -r -m elf32_x86_64 -Map tmpdir/pr24721.map
+#readelf: -n
+#map: pr24721.map
diff --git a/ld/testsuite/ld-x86-64/pr24721.d b/ld/testsuite/ld-x86-64/pr24721.d
new file mode 100644
index 0000000..efa88db
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24721.d
@@ -0,0 +1,6 @@
+#source: pr24721a.s
+#source: pr24721b.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=no
+#ld: -r -melf_x86_64 -Map tmpdir/pr24721.map
+#readelf: -n
+#map: pr24721.map
diff --git a/ld/testsuite/ld-x86-64/pr24721.map b/ld/testsuite/ld-x86-64/pr24721.map
new file mode 100644
index 0000000..9e63fff
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24721.map
@@ -0,0 +1,3 @@
+#...
+Removed property 0xc0000002 to merge tmpdir/pr24721a.o \(0x1\) and tmpdir/pr24721b.o \(not found\)
+#pass
diff --git a/ld/testsuite/ld-x86-64/pr24721a.s b/ld/testsuite/ld-x86-64/pr24721a.s
new file mode 100644
index 0000000..b229d19
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24721a.s
@@ -0,0 +1,34 @@
+ .text
+ .globl foo
+ .type foo,@function
+ .p2align 4
+foo:
+ ret
+
+ .section ".note.gnu.property", "a"
+.ifdef __64_bit__
+ .p2align 3
+.else
+ .p2align 2
+.endif
+ .long 1f - 0f /* name length */
+ .long 5f - 2f /* data length */
+ .long 5 /* note type */
+0: .asciz "GNU" /* vendor name */
+1:
+.ifdef __64_bit__
+ .p2align 3
+.else
+ .p2align 2
+.endif
+2: .long 0xc0000002 /* pr_type. */
+ .long 4f - 3f /* pr_datasz. */
+3:
+ .long 0x1
+4:
+.ifdef __64_bit__
+ .p2align 3
+.else
+ .p2align 2
+.endif
+5:
diff --git a/ld/testsuite/ld-x86-64/pr24721b.s b/ld/testsuite/ld-x86-64/pr24721b.s
new file mode 100644
index 0000000..3d11691
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24721b.s
@@ -0,0 +1,6 @@
+ .text
+ .globl bar
+ .type bar,@function
+ .p2align 4
+bar:
+ ret
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 23f2020..d815e5d 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -456,6 +456,8 @@ run_dump_test "pr24458b"
run_dump_test "pr24458b-x32"
run_dump_test "pr24458c"
run_dump_test "pr24458c-x32"
+run_dump_test "pr24721"
+run_dump_test "pr24721-x32"
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
return