x86: make common property tests common

There's no need to run the exact same test twice. Move the tests which
don't differ between 32- and 64-bit to the "Common tests" section.

10 files changed, 10 insertions, 108 deletions

diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index b4a75e4..5a481a4 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -655,15 +655,6 @@ if [gas_32_check] then {
 	run_dump_test "unique"
 
 	run_dump_test "property-1"
-	run_dump_test "property-2"
-	run_dump_test "property-3"
-	run_dump_test "property-4"
-	run_dump_test "property-5"
-	run_dump_test "property-6"
-	run_dump_test "property-10"
-	run_dump_test "property-11"
-	run_dump_test "property-12"
-	run_dump_test "property-13"
 
 	if {[istarget "*-*-linux*"]} then {
 	    run_dump_test "align-branch-3"
@@ -725,6 +716,16 @@ if {[is_elf_format] || [istarget "*-*-vxworks*"]} then {
     run_dump_test "dw2-compressed-3a"
     run_dump_test "dw2-compressed-3b"
 
+    run_dump_test "property-2"
+    run_dump_test "property-3"
+    run_dump_test "property-4"
+    run_dump_test "property-5"
+    run_dump_test "property-6"
+    run_dump_test "property-10"
+    run_dump_test "property-11"
+    run_dump_test "property-12"
+    run_dump_test "property-13"
+
     if {![istarget "*-*-dragonfly*"]
 	&& ![istarget "*-*-gnu*"]
 	&& ![istarget "*-*-freebsd*"]
@@ -1274,18 +1275,9 @@ if [gas_64_check] then {
 	run_dump_test "x86-64-unique"
 
 	run_dump_test "x86-64-property-1"
-	run_dump_test "x86-64-property-2"
-	run_dump_test "x86-64-property-3"
-	run_dump_test "x86-64-property-4"
-	run_dump_test "x86-64-property-5"
-	run_dump_test "x86-64-property-6"
 	run_dump_test "x86-64-property-7"
 	run_dump_test "x86-64-property-8"
 	run_dump_test "x86-64-property-9"
-	run_dump_test "x86-64-property-10"
-	run_dump_test "x86-64-property-11"
-	run_dump_test "x86-64-property-12"
-	run_dump_test "x86-64-property-13"
 	run_dump_test "x86-64-property-14"
 
 	if {[istarget "*-*-linux*"]} then {
diff --git a/gas/testsuite/gas/i386/x86-64-property-10.d b/gas/testsuite/gas/i386/x86-64-property-10.d
deleted file mode 100644
index 1e7748f..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-10.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 10
-#source: property-10.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline
-	x86 feature used: x86, XMM
diff --git a/gas/testsuite/gas/i386/x86-64-property-11.d b/gas/testsuite/gas/i386/x86-64-property-11.d
deleted file mode 100644
index d93e01b..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-11.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 11
-#source: property-11.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline, x86-64-v3
-	x86 feature used: x86, XMM
diff --git a/gas/testsuite/gas/i386/x86-64-property-12.d b/gas/testsuite/gas/i386/x86-64-property-12.d
deleted file mode 100644
index 1683204..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-12.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 12
-#source: property-12.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline, x86-64-v4
-	x86 feature used: x86, XMM, MASK
diff --git a/gas/testsuite/gas/i386/x86-64-property-13.d b/gas/testsuite/gas/i386/x86-64-property-13.d
deleted file mode 100644
index 5ed609a..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-13.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 13
-#source: property-13.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline
-	x86 feature used: x86, XMM, YMM, ZMM, MASK
diff --git a/gas/testsuite/gas/i386/x86-64-property-2.d b/gas/testsuite/gas/i386/x86-64-property-2.d
deleted file mode 100644
index d54dff9..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-2.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 2
-#source: property-2.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline
-	x86 feature used: x86
diff --git a/gas/testsuite/gas/i386/x86-64-property-3.d b/gas/testsuite/gas/i386/x86-64-property-3.d
deleted file mode 100644
index d248505..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-3.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 3
-#source: property-3.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline, x86-64-v2
-	x86 feature used: x86, XMM
diff --git a/gas/testsuite/gas/i386/x86-64-property-4.d b/gas/testsuite/gas/i386/x86-64-property-4.d
deleted file mode 100644
index be1d485..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-4.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 4
-#source: property-4.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline, x86-64-v3
-	x86 feature used: x86, XMM
diff --git a/gas/testsuite/gas/i386/x86-64-property-5.d b/gas/testsuite/gas/i386/x86-64-property-5.d
deleted file mode 100644
index a1385c2..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-5.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 5
-#source: property-5.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline, x86-64-v4
-	x86 feature used: x86, XMM
diff --git a/gas/testsuite/gas/i386/x86-64-property-6.d b/gas/testsuite/gas/i386/x86-64-property-6.d
deleted file mode 100644
index 5cdb873..0000000
--- a/gas/testsuite/gas/i386/x86-64-property-6.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#name: x86-64 property 6
-#source: property-6.s
-#as: -mx86-used-note=yes --generate-missing-build-notes=no
-#readelf: -n
-
-Displaying notes found in: .note.gnu.property
-[ 	]+Owner[ 	]+Data size[ 	]+Description
-  GNU                  0x[0-9a-f]+	NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 ISA used: x86-64-baseline, x86-64-v4
-	x86 feature used: x86, MASK