ld: Pass -z separate-code to ld for property-x86-4a tests

Pass -z separate-code to ld for property-x86-4a tests to generate
the expected .note.gnu.property section.  Also run i386 tests for
x86_64-*-elf* targets.

	* testsuite/ld-i386/i386.exp: Also run for x86_64-*-elf* targets.
	* testsuite/ld-i386/property-x86-4a.d: Pass -z separate-code to
	ld.
	* testsuite/ld-x86-64/property-x86-4a-x32.d: Likewise.
	* testsuite/ld-x86-64/property-x86-4a.d: Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2d1e90030b80a8ce8de1bb76a6dce37ed336215f..6d929c7018159d87e0fd3df6a89c5924638321a8 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * testsuite/ld-i386/i386.exp: Also run for x86_64-*-elf* targets.
+       * testsuite/ld-i386/property-x86-4a.d: Pass -z separate-code to
+       ld.
+       * testsuite/ld-x86-64/property-x86-4a-x32.d: Likewise.
+       * testsuite/ld-x86-64/property-x86-4a.d: Likewise.
+
 2018-08-31  H.J. Lu  <hongjiu.lu@intel.com>
 
        * testsuite/ld-elf/elf.exp (ASFLAGS): Save, append

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 703c327ce1c74addf4977965f685e1c8c94ad463..21f55932497f2af56742ef6caaeaa1bfc3953044 100644 (file)
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -109,6 +109,7 @@ if { !([istarget "i?86-*-elf*"]
        || [istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
        || [istarget "i?86-*-nacl*"]
+       || [istarget "x86_64-*-elf*"]
        || [istarget "x86_64-*-nacl*"]
        || [istarget "x86_64-*-linux*"]
        || [istarget "amd64-*-linux*"]) } {

diff --git a/ld/testsuite/ld-i386/property-x86-4a.d b/ld/testsuite/ld-i386/property-x86-4a.d
index 6d94b7360c0c090be3b21708a83bcc68fb3b02b9..8ab0115cdd36010bac78b0ce0a7acaf99edd6bee 100644 (file)
--- a/ld/testsuite/ld-i386/property-x86-4a.d
+++ b/ld/testsuite/ld-i386/property-x86-4a.d
@@ -1,7 +1,7 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
 #as: --32 -mx86-used-note=yes
-#ld: -m elf_i386 --gc-sections --entry=main
+#ld: -m elf_i386 --gc-sections --entry=main -z separate-code
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property

diff --git a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
index 7c6a2e129b1a7de5c4cb3b5d245f0e0e6bce5f62..9dd6e3540e6b47c4fa1f76f19fca52f6a1657545 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a-x32.d
@@ -1,7 +1,7 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
 #as: --x32 -mx86-used-note=yes
-#ld: -m elf32_x86_64 --gc-sections --entry=main
+#ld: -m elf32_x86_64 --gc-sections --entry=main -z separate-code
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property

diff --git a/ld/testsuite/ld-x86-64/property-x86-4a.d b/ld/testsuite/ld-x86-64/property-x86-4a.d
index 8637ed4e9822dad460a2701aca1e29a62193d59a..4dc87acd56f4250851c2fec38f8bdbae6c627c45 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-4a.d
+++ b/ld/testsuite/ld-x86-64/property-x86-4a.d
@@ -1,7 +1,7 @@
 #source: property-x86-4a.s
 #source: property-x86-4b.s
 #as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
-#ld: -m elf_x86_64 --gc-sections --entry=main
+#ld: -m elf_x86_64 --gc-sections --entry=main -z separate-code
 #readelf: -n
 
 Displaying notes found in: .note.gnu.property