|
 |
869a11 |
diff -rup binutils.orig/bfd/elfxx-x86.c binutils-2.30/bfd/elfxx-x86.c
|
|
|
869a11 |
--- binutils.orig/bfd/elfxx-x86.c 2018-07-30 16:01:04.881710127 +0100
|
|
|
869a11 |
+++ binutils-2.30/bfd/elfxx-x86.c 2018-07-30 16:01:28.809447800 +0100
|
|
|
869a11 |
@@ -2320,13 +2320,34 @@ _bfd_x86_elf_merge_gnu_properties (struc
|
|
|
869a11 |
{
|
|
|
869a11 |
number = aprop->u.number;
|
|
|
869a11 |
aprop->u.number = number | bprop->u.number;
|
|
|
869a11 |
- updated = number != (unsigned int) aprop->u.number;
|
|
|
869a11 |
+ /* Remove the property if ISA bits are empty. */
|
|
|
869a11 |
+ if (aprop->u.number == 0)
|
|
|
869a11 |
+ {
|
|
|
869a11 |
+ aprop->pr_kind = property_remove;
|
|
|
869a11 |
+ updated = TRUE;
|
|
|
869a11 |
+ }
|
|
|
869a11 |
+ else
|
|
|
869a11 |
+ updated = number != (unsigned int) aprop->u.number;
|
|
|
869a11 |
}
|
|
|
869a11 |
else
|
|
|
869a11 |
{
|
|
|
869a11 |
- /* Return TRUE if APROP is NULL to indicate that BPROP should
|
|
|
869a11 |
- be added to ABFD. */
|
|
|
869a11 |
- updated = aprop == NULL;
|
|
|
869a11 |
+ /* Only one of APROP and BPROP can be NULL. */
|
|
|
869a11 |
+ if (aprop != NULL)
|
|
|
869a11 |
+ {
|
|
|
869a11 |
+ if (aprop->u.number == 0)
|
|
|
869a11 |
+ {
|
|
|
869a11 |
+ /* Remove APROP if ISA bits are empty. */
|
|
|
869a11 |
+ aprop->pr_kind = property_remove;
|
|
|
869a11 |
+ updated = TRUE;
|
|
|
869a11 |
+ }
|
|
|
869a11 |
+ }
|
|
|
869a11 |
+ else
|
|
|
869a11 |
+ {
|
|
|
869a11 |
+ /* Return TRUE if APROP is NULL and ISA bits of BPROP
|
|
|
869a11 |
+ aren't empty to indicate that BPROP should be added
|
|
|
869a11 |
+ to ABFD. */
|
|
|
869a11 |
+ updated = bprop->u.number != 0;
|
|
|
869a11 |
+ }
|
|
|
869a11 |
}
|
|
|
869a11 |
break;
|
|
|
869a11 |
|
|
|
869a11 |
diff -rup binutils.orig/ld/testsuite/ld-i386/i386.exp binutils-2.30/ld/testsuite/ld-i386/i386.exp
|
|
|
869a11 |
--- binutils.orig/ld/testsuite/ld-i386/i386.exp 2018-07-30 16:00:54.241826775 +0100
|
|
|
869a11 |
+++ binutils-2.30/ld/testsuite/ld-i386/i386.exp 2018-07-30 16:02:58.911459984 +0100
|
|
|
869a11 |
@@ -450,6 +450,8 @@ run_dump_test "pr22115-1b"
|
|
|
869a11 |
run_dump_test "pr22115-1c"
|
|
|
869a11 |
run_dump_test "pr22115-1d"
|
|
|
869a11 |
run_dump_test "pr22135"
|
|
|
869a11 |
+run_dump_test "pr23372a"
|
|
|
869a11 |
+run_dump_test "pr23372b"
|
|
|
869a11 |
|
|
|
869a11 |
if { !([istarget "i?86-*-linux*"]
|
|
|
869a11 |
|| [istarget "i?86-*-gnu*"]
|
|
|
869a11 |
diff -rup binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp binutils-2.30/ld/testsuite/ld-x86-64/x86-64.exp
|
|
|
869a11 |
--- binutils.orig/ld/testsuite/ld-x86-64/x86-64.exp 2018-07-30 16:00:55.340814726 +0100
|
|
|
869a11 |
+++ binutils-2.30/ld/testsuite/ld-x86-64/x86-64.exp 2018-07-30 16:03:32.624090383 +0100
|
|
|
869a11 |
@@ -379,6 +379,10 @@ run_dump_test "pr22115-1c-x32"
|
|
|
869a11 |
run_dump_test "pr22115-1d"
|
|
|
869a11 |
run_dump_test "pr22115-1d-x32"
|
|
|
869a11 |
run_dump_test "pr22135"
|
|
|
869a11 |
+run_dump_test "pr23372a"
|
|
|
869a11 |
+run_dump_test "pr23372a-x32"
|
|
|
869a11 |
+run_dump_test "pr23372b"
|
|
|
869a11 |
+run_dump_test "pr23372b-x32"
|
|
|
869a11 |
|
|
|
869a11 |
if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
|
|
|
869a11 |
return
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-i386/pr23372a.d b/ld/testsuite/ld-i386/pr23372a.d
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..b75523bdc3
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-i386/pr23372a.d
|
|
|
869a11 |
@@ -0,0 +1,5 @@
|
|
|
869a11 |
+#source: pr23372a.s
|
|
|
869a11 |
+#source: pr23372b.s
|
|
|
869a11 |
+#as: --32
|
|
|
869a11 |
+#ld: -r -m elf_i386
|
|
|
869a11 |
+#readelf: -n
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-i386/pr23372a.s b/ld/testsuite/ld-i386/pr23372a.s
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..9849d620a1
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-i386/pr23372a.s
|
|
|
869a11 |
@@ -0,0 +1,18 @@
|
|
|
869a11 |
+ .section ".note.gnu.property", "a"
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+ .long 1f - 0f /* name length. */
|
|
|
869a11 |
+ .long 4f - 1f /* data length. */
|
|
|
869a11 |
+ /* NT_GNU_PROPERTY_TYPE_0 */
|
|
|
869a11 |
+ .long 5 /* note type. */
|
|
|
869a11 |
+0:
|
|
|
869a11 |
+ .asciz "GNU" /* vendor name. */
|
|
|
869a11 |
+1:
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+ /* GNU_PROPERTY_X86_ISA_1_USED */
|
|
|
869a11 |
+ .long 0xc0000000 /* pr_type. */
|
|
|
869a11 |
+ .long 3f - 2f /* pr_datasz. */
|
|
|
869a11 |
+2:
|
|
|
869a11 |
+ .long 0x0
|
|
|
869a11 |
+3:
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+4:
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-i386/pr23372b.d b/ld/testsuite/ld-i386/pr23372b.d
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..a8e9c819a4
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-i386/pr23372b.d
|
|
|
869a11 |
@@ -0,0 +1,5 @@
|
|
|
869a11 |
+#source: pr23372a.s
|
|
|
869a11 |
+#source: pr23372c.s
|
|
|
869a11 |
+#as: --32
|
|
|
869a11 |
+#ld: -r -m elf_i386
|
|
|
869a11 |
+#readelf: -n
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-i386/pr23372b.s b/ld/testsuite/ld-i386/pr23372b.s
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..9849d620a1
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-i386/pr23372b.s
|
|
|
869a11 |
@@ -0,0 +1,18 @@
|
|
|
869a11 |
+ .section ".note.gnu.property", "a"
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+ .long 1f - 0f /* name length. */
|
|
|
869a11 |
+ .long 4f - 1f /* data length. */
|
|
|
869a11 |
+ /* NT_GNU_PROPERTY_TYPE_0 */
|
|
|
869a11 |
+ .long 5 /* note type. */
|
|
|
869a11 |
+0:
|
|
|
869a11 |
+ .asciz "GNU" /* vendor name. */
|
|
|
869a11 |
+1:
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+ /* GNU_PROPERTY_X86_ISA_1_USED */
|
|
|
869a11 |
+ .long 0xc0000000 /* pr_type. */
|
|
|
869a11 |
+ .long 3f - 2f /* pr_datasz. */
|
|
|
869a11 |
+2:
|
|
|
869a11 |
+ .long 0x0
|
|
|
869a11 |
+3:
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+4:
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-i386/pr23372c.s b/ld/testsuite/ld-i386/pr23372c.s
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..3470dce649
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-i386/pr23372c.s
|
|
|
869a11 |
@@ -0,0 +1,18 @@
|
|
|
869a11 |
+ .section ".note.gnu.property", "a"
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+ .long 1f - 0f /* name length. */
|
|
|
869a11 |
+ .long 4f - 1f /* data length. */
|
|
|
869a11 |
+ /* NT_GNU_PROPERTY_TYPE_0 */
|
|
|
869a11 |
+ .long 5 /* note type. */
|
|
|
869a11 |
+0:
|
|
|
869a11 |
+ .asciz "GNU" /* vendor name. */
|
|
|
869a11 |
+1:
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */
|
|
|
869a11 |
+ .long 0xc0000001 /* pr_type. */
|
|
|
869a11 |
+ .long 3f - 2f /* pr_datasz. */
|
|
|
869a11 |
+2:
|
|
|
869a11 |
+ .long 0x0
|
|
|
869a11 |
+3:
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+4:
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372a-x32.d b/ld/testsuite/ld-x86-64/pr23372a-x32.d
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..9f93642364
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372a-x32.d
|
|
|
869a11 |
@@ -0,0 +1,5 @@
|
|
|
869a11 |
+#source: pr23372a.s
|
|
|
869a11 |
+#source: pr23372b.s
|
|
|
869a11 |
+#as: --x32
|
|
|
869a11 |
+#ld: -r -m elf32_x86_64
|
|
|
869a11 |
+#readelf: -n
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372a.d b/ld/testsuite/ld-x86-64/pr23372a.d
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..ee688fc2e2
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372a.d
|
|
|
869a11 |
@@ -0,0 +1,5 @@
|
|
|
869a11 |
+#source: pr23372a.s
|
|
|
869a11 |
+#source: pr23372b.s
|
|
|
869a11 |
+#as: --64 -defsym __64_bit__=1
|
|
|
869a11 |
+#ld: -r -m elf_x86_64
|
|
|
869a11 |
+#readelf: -n
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372a.s b/ld/testsuite/ld-x86-64/pr23372a.s
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..639fc26de4
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372a.s
|
|
|
869a11 |
@@ -0,0 +1,30 @@
|
|
|
869a11 |
+ .section ".note.gnu.property", "a"
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+ .long 1f - 0f /* name length. */
|
|
|
869a11 |
+ .long 4f - 1f /* data length. */
|
|
|
869a11 |
+ /* NT_GNU_PROPERTY_TYPE_0 */
|
|
|
869a11 |
+ .long 5 /* note type. */
|
|
|
869a11 |
+0:
|
|
|
869a11 |
+ .asciz "GNU" /* vendor name. */
|
|
|
869a11 |
+1:
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+ /* GNU_PROPERTY_X86_ISA_1_USED */
|
|
|
869a11 |
+ .long 0xc0000000 /* pr_type. */
|
|
|
869a11 |
+ .long 3f - 2f /* pr_datasz. */
|
|
|
869a11 |
+2:
|
|
|
869a11 |
+ .long 0x0
|
|
|
869a11 |
+3:
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+4:
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372b-x32.d b/ld/testsuite/ld-x86-64/pr23372b-x32.d
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..5b0cf98618
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372b-x32.d
|
|
|
869a11 |
@@ -0,0 +1,5 @@
|
|
|
869a11 |
+#source: pr23372a.s
|
|
|
869a11 |
+#source: pr23372c.s
|
|
|
869a11 |
+#as: --x32
|
|
|
869a11 |
+#ld: -r -m elf32_x86_64
|
|
|
869a11 |
+#readelf: -n
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372b.d b/ld/testsuite/ld-x86-64/pr23372b.d
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..727afa8ab5
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372b.d
|
|
|
869a11 |
@@ -0,0 +1,5 @@
|
|
|
869a11 |
+#source: pr23372a.s
|
|
|
869a11 |
+#source: pr23372c.s
|
|
|
869a11 |
+#as: --64 -defsym __64_bit__=1
|
|
|
869a11 |
+#ld: -r -m elf_x86_64
|
|
|
869a11 |
+#readelf: -n
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372b.s b/ld/testsuite/ld-x86-64/pr23372b.s
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..639fc26de4
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372b.s
|
|
|
869a11 |
@@ -0,0 +1,30 @@
|
|
|
869a11 |
+ .section ".note.gnu.property", "a"
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+ .long 1f - 0f /* name length. */
|
|
|
869a11 |
+ .long 4f - 1f /* data length. */
|
|
|
869a11 |
+ /* NT_GNU_PROPERTY_TYPE_0 */
|
|
|
869a11 |
+ .long 5 /* note type. */
|
|
|
869a11 |
+0:
|
|
|
869a11 |
+ .asciz "GNU" /* vendor name. */
|
|
|
869a11 |
+1:
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+ /* GNU_PROPERTY_X86_ISA_1_USED */
|
|
|
869a11 |
+ .long 0xc0000000 /* pr_type. */
|
|
|
869a11 |
+ .long 3f - 2f /* pr_datasz. */
|
|
|
869a11 |
+2:
|
|
|
869a11 |
+ .long 0x0
|
|
|
869a11 |
+3:
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+4:
|
|
|
869a11 |
diff --git a/ld/testsuite/ld-x86-64/pr23372c.s b/ld/testsuite/ld-x86-64/pr23372c.s
|
|
|
869a11 |
new file mode 100644
|
|
|
869a11 |
index 0000000000..b4eaf69777
|
|
|
869a11 |
--- /dev/null
|
|
|
869a11 |
+++ b/ld/testsuite/ld-x86-64/pr23372c.s
|
|
|
869a11 |
@@ -0,0 +1,30 @@
|
|
|
869a11 |
+ .section ".note.gnu.property", "a"
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+ .long 1f - 0f /* name length. */
|
|
|
869a11 |
+ .long 4f - 1f /* data length. */
|
|
|
869a11 |
+ /* NT_GNU_PROPERTY_TYPE_0 */
|
|
|
869a11 |
+ .long 5 /* note type. */
|
|
|
869a11 |
+0:
|
|
|
869a11 |
+ .asciz "GNU" /* vendor name. */
|
|
|
869a11 |
+1:
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */
|
|
|
869a11 |
+ .long 0xc0000001 /* pr_type. */
|
|
|
869a11 |
+ .long 3f - 2f /* pr_datasz. */
|
|
|
869a11 |
+2:
|
|
|
869a11 |
+ .long 0x0
|
|
|
869a11 |
+3:
|
|
|
869a11 |
+.ifdef __64_bit__
|
|
|
869a11 |
+ .p2align 3
|
|
|
869a11 |
+.else
|
|
|
869a11 |
+ .p2align 2
|
|
|
869a11 |
+.endif
|
|
|
869a11 |
+4:
|