From df010caac3b33b1d38b6d67024091854c3f77c77 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 24 Jun 2019 11:08:40 -0700
Subject: [PATCH] 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.
(cherry picked from commit f93ab3a0b8039a1667a666f013cca50b03d67f9b)
---
bfd/ChangeLog | 6 +++++
bfd/elf-properties.c | 10 ++++----
ld/ChangeLog | 10 ++++++++
ld/testsuite/ld-x86-64/pr24721-x32.d | 6 +++++
ld/testsuite/ld-x86-64/pr24721.d | 6 +++++
ld/testsuite/ld-x86-64/pr24721.map | 3 +++
ld/testsuite/ld-x86-64/pr24721a.s | 34 ++++++++++++++++++++++++++++
ld/testsuite/ld-x86-64/pr24721b.s | 6 +++++
ld/testsuite/ld-x86-64/x86-64.exp | 2 ++
9 files changed, 77 insertions(+), 6 deletions(-)
create mode 100644 ld/testsuite/ld-x86-64/pr24721-x32.d
create mode 100644 ld/testsuite/ld-x86-64/pr24721.d
create mode 100644 ld/testsuite/ld-x86-64/pr24721.map
create mode 100644 ld/testsuite/ld-x86-64/pr24721a.s
create mode 100644 ld/testsuite/ld-x86-64/pr24721b.s
#diff --git a/bfd/ChangeLog b/bfd/ChangeLog
#index e6979c1a44..b0167fe25f 100644
#--- a/bfd/ChangeLog
#+++ b/bfd/ChangeLog
#@@ -1,3 +1,9 @@
#+2019-06-24 H.J. Lu <hongjiu.lu@intel.com>
#+
#+ PR ld/24721
#+ * elf-properties.c (elf_merge_gnu_property_list): Remove the
#+ property after reporting property removal.
#+
# 2019-04-18 Tamar Christina <tamar.christina@arm.com>
#
# Backport from mainline.
diff --git a/bfd/elf-properties.c b/bfd/elf-properties.c
index 5e48d75faa..4a9907ff7e 100644
--- a/bfd/elf-properties.c
+++ b/bfd/elf-properties.c
@@ -322,12 +322,10 @@ elf_merge_gnu_property_list (struct bfd_link_info *info, bfd *first_pbfd,
(bfd_vma) p->property.pr_type, first_pbfd, abfd);
}
}
- else
- {
- /* Remove this property. */
- *lastp = p->next;
- continue;
- }
+
+ /* Remove this property. */
+ *lastp = p->next;
+ continue;
}
else if (number_p)
{
#diff --git a/ld/ChangeLog b/ld/ChangeLog
#index 5ac2362e1b..73bee92dab 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-05-17 Alan Modra <amodra@gmail.com>
#
# PR 24567
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 0000000000..9b067efdc1
--- /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 0000000000..efa88db2b3
--- /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 0000000000..9e63fff275
--- /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 0000000000..b229d19b02
--- /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 0000000000..3d11691166
--- /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 9a76486fbc..707ab89f8e 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -432,6 +432,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
--
2.21.0
