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