diff --git a/ld/ChangeLog b/ld/ChangeLog
index 50c78132f4b..e21f447ea25 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,19 @@
+2017-06-09  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* testsuite/ld-x86-64/property-x86-3-x32.d: New file.
+	* testsuite/ld-x86-64/property-x86-4a-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-4b-x32.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-3.d: Also pass
+	-defsym __64_bit__=1 to asssembler.
+	* testsuite/ld-x86-64/property-x86-4a.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-4b.d: Likewise.
+	* testsuite/ld-x86-64/property-x86-3.s: Align to 4 bytes if
+	__64_bit__ isn't defined.
+	* testsuite/ld-x86-64/property-x86-4a.s: Likewise.
+	* testsuite/ld-x86-64/property-x86-4b.s: Likewise.
+	* testsuite/ld-x86-64/x86-64.exp: Run property-x86-3-x32,
+	property-x86-4a-x32 and property-x86-4b-x32.
+
 2017-06-08  Cupertino Miranda  <cmiranda@synopsys.com>
 
 	* testsuite/ld-arc/tls_ie-01.d: Changed expected result.
diff --git a/ld/testsuite/ld-x86-64/property-x86-3-x32.d b/ld/testsuite/ld-x86-64/property-x86-3-x32.d
new file mode 100644
index 00000000000..cd8a2b5c36c
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-3-x32.d
@@ -0,0 +1,10 @@
+#source: property-x86-3.s
+#as: --x32
+#ld: -shared -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000018	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1
+	x86 ISA needed: i486, 586, SSE2, SSE3
diff --git a/ld/testsuite/ld-x86-64/property-x86-3.d b/ld/testsuite/ld-x86-64/property-x86-3.d
index 1e0348c8ab3..6686b14dd0a 100644
--- a/ld/testsuite/ld-x86-64/property-x86-3.d
+++ b/ld/testsuite/ld-x86-64/property-x86-3.d
@@ -1,4 +1,4 @@
-#as: --64
+#as: --64 -defsym __64_bit__=1
 #ld: -shared -m elf_x86_64
 #readelf: -n
 
diff --git a/ld/testsuite/ld-x86-64/property-x86-3.s b/ld/testsuite/ld-x86-64/property-x86-3.s
index e87ac81770e..be8cc9efb1b 100644
--- a/ld/testsuite/ld-x86-64/property-x86-3.s
+++ b/ld/testsuite/ld-x86-64/property-x86-3.s
@@ -1,5 +1,9 @@
 	.section ".note.gnu.property", "a"
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 	.long 1f - 0f		/* name length.  */
 	.long 3f - 1f		/* data length.  */
 	/* NT_GNU_PROPERTY_TYPE_0 */
@@ -7,21 +11,33 @@
 0:
 	.asciz "GNU"		/* vendor name.  */
 1:
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 	/* GNU_PROPERTY_X86_ISA_1_USED */
 	.long 0xc0000000	/* pr_type.  */
 	.long 5f - 4f		/* pr_datasz.  */
 4:
 	.long 0xa
 5:
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 	/* GNU_PROPERTY_X86_ISA_1_NEEDED */
 	.long 0xc0000001	/* pr_type.  */
 	.long 5f - 4f		/* pr_datasz.  */
 4:
 	.long 0x3
 5:
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 3:
 
 	.section ".note.gnu.property", "a"
@@ -33,19 +49,31 @@
 0:
 	.asciz "GNU"		/* vendor name.  */
 1:
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 	/* GNU_PROPERTY_X86_ISA_1_USED */
 	.long 0xc0000000	/* pr_type.  */
 	.long 5f - 4f		/* pr_datasz.  */
 4:
 	.long 0xa0
 5:
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 	/* GNU_PROPERTY_X86_ISA_1_NEEDED */
 	.long 0xc0000001	/* pr_type.  */
 	.long 5f - 4f		/* pr_datasz.  */
 4:
 	.long 0x30
 5:
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 3:
diff --git a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
new file mode 100644
index 00000000000..90125135332
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
@@ -0,0 +1,10 @@
+#source: property-x86-4a.s
+#source: property-x86-4b.s
+#as: --x32
+#ld: -m elf32_x86_64 --gc-sections --entry=main
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000008	NT_GNU_PROPERTY_TYPE_0
+      Properties: no copy on protected 
diff --git a/ld/testsuite/ld-x86-64/property-x86-4a.d b/ld/testsuite/ld-x86-64/property-x86-4a.d
index 50be0b73cf8..5e8cf4cf848 100644
--- a/ld/testsuite/ld-x86-64/property-x86-4a.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a.d
@@ -1,6 +1,6 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
-#as: --64
+#as: --64 -defsym __64_bit__=1
 #ld: -m elf_x86_64 --gc-sections --entry=main
 #readelf: -n
 
diff --git a/ld/testsuite/ld-x86-64/property-x86-4b-x32.d b/ld/testsuite/ld-x86-64/property-x86-4b-x32.d
new file mode 100644
index 00000000000..10e2efbfbc0
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/property-x86-4b-x32.d
@@ -0,0 +1,10 @@
+#source: property-x86-4a.s
+#source: property-x86-4b.s
+#as: --x32
+#ld: -m elf32_x86_64 --gc-sections --entry=main
+#readelf: -S --wide
+
+#failif
+#...
+ +\[ [0-9]\] .debug_info.*
+#...
diff --git a/ld/testsuite/ld-x86-64/property-x86-4b.d b/ld/testsuite/ld-x86-64/property-x86-4b.d
index 194dd6c1ad8..a53833cec61 100644
--- a/ld/testsuite/ld-x86-64/property-x86-4b.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4b.d
@@ -1,6 +1,6 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
-#as: --64
+#as: --64 -defsym __64_bit__=1
 #ld: -m elf_x86_64 --gc-sections --entry=main
 #readelf: -S --wide
 
diff --git a/ld/testsuite/ld-x86-64/property-x86-4b.s b/ld/testsuite/ld-x86-64/property-x86-4b.s
index 3da10552e2b..7a2c7073ae4 100644
--- a/ld/testsuite/ld-x86-64/property-x86-4b.s
+++ b/ld/testsuite/ld-x86-64/property-x86-4b.s
@@ -5,16 +5,29 @@ t.c.4903c230:
 	.byte 0x28
 
 	.section ".note.gnu.property", "a"
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 	.long 1f - 0f		/* name length.  */
 	.long 3f - 2f		/* data length.  */
 	/* NT_GNU_PROPERTY_TYPE_0 */
 	.long 5			/* note type.  */
 0:	.asciz "GNU"		/* vendor name.  */
-1:	.p2align 3
+1:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
 2:
 	/* GNU_PROPERTY_NO_COPY_ON_PROTECTED */
 	.long 2			/* pr_type.  */
 	.long 0			/* pr_datasz.  */
+.ifdef __64_bit__
 	.p2align 3
+.else
+	.p2align 2
+.endif
 3:
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index ebb55f3cb39..079c161a6f4 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -332,6 +332,9 @@ run_dump_test "pr20093-2"
 run_dump_test "property-x86-3"
 run_dump_test "property-x86-4a"
 run_dump_test "property-x86-4b"
+run_dump_test "property-x86-3-x32"
+run_dump_test "property-x86-4a-x32"
+run_dump_test "property-x86-4b-x32"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return