2009-09-14 H.J. Lu <hongjiu.lu@intel.com>

	* gas/i386/merom.[ds]: Renamed to ...
	* gas/i386/ssse3.[ds]: This.

	* gas/i386/nops-1-merom.d: Renamed to ...
	* gas/i386/nops-1-core2.d: This.

	* gas/i386/nops-2-merom.d: Renamed to ...
	* gas/i386/nops-2-core2.d: This.

	* gas/i386/prescott.[ds]: Renamed to ...
	* gas/i386/sse3.[ds]: This.

	* gas/i386/x86-64-merom.[ds]: Renamed to ...
	* gas/i386/x86-64-ssse3.[ds]: This.

	* gas/i386/x86-64-nops-1-merom.d: Renamed to ...
	* gas/i386/x86-64-nops-1-core2.d: This.

	* gas/i386/x86-64-prescott.[ds]: Renamed to ...
	* gas/i386/x86-64-sse3.[ds]: This.

	* gas/i386/i386.exp: Updated.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fa5023f5590924bda3a40c56ff8a380ee47cfad3..3b799430b1b6bb7e4716a19a8791819e1bee7cb2 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,28 @@
+2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * gas/i386/merom.[ds]: Renamed to ...
+       * gas/i386/ssse3.[ds]: This.
+
+       * gas/i386/nops-1-merom.d: Renamed to ...
+       * gas/i386/nops-1-core2.d: This.
+
+       * gas/i386/nops-2-merom.d: Renamed to ...
+       * gas/i386/nops-2-core2.d: This.
+
+       * gas/i386/prescott.[ds]: Renamed to ...
+       * gas/i386/sse3.[ds]: This.
+
+       * gas/i386/x86-64-merom.[ds]: Renamed to ...
+       * gas/i386/x86-64-ssse3.[ds]: This.
+
+       * gas/i386/x86-64-nops-1-merom.d: Renamed to ...
+       * gas/i386/x86-64-nops-1-core2.d: This.
+
+       * gas/i386/x86-64-prescott.[ds]: Renamed to ...
+       * gas/i386/x86-64-sse3.[ds]: This.
+
+       * gas/i386/i386.exp: Updated.
+
 2009-09-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gas/10636

diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index fc6748200e82f053902c6020d917fb27b4982b58..c93ebc20fbfa29132b992803bb86cab443bb65af 100644 (file)
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -44,7 +44,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "ssemmx2"
     run_dump_test "sse2"
     run_dump_test "sub"
-    run_dump_test "prescott"
+    run_dump_test "sse3"
     run_dump_test "sib"
     run_dump_test "sib-intel"
     run_dump_test "disp"
@@ -59,7 +59,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_list_test "cr-err" ""
     run_dump_test "svme"
     run_dump_test "amdfam10"
-    run_dump_test "merom"
+    run_dump_test "ssse3"
     run_dump_test "rep"
     run_dump_test "rep-suffix"
     run_dump_test "fp"
@@ -70,10 +70,10 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_dump_test "nops-1-i386-i686"
     run_dump_test "nops-1-i686"
     run_dump_test "nops-1-k8"
-    run_dump_test "nops-1-merom"
+    run_dump_test "nops-1-core2"
     run_dump_test "nops-2"
     run_dump_test "nops-2-i386"
-    run_dump_test "nops-2-merom"
+    run_dump_test "nops-2-core2"
     run_dump_test "nops-3"
     run_dump_test "nops-3-i386"
     run_dump_test "nops-3-i686"
@@ -238,12 +238,12 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-amdfam10"
     run_dump_test "x86-64-vmx"
     run_dump_test "immed64"
-    run_dump_test "x86-64-prescott"
+    run_dump_test "x86-64-sse3"
     run_dump_test "x86-64-crx"
     run_dump_test "x86-64-crx-suffix"
     run_dump_test "x86-64-drx"
     run_dump_test "x86-64-drx-suffix"
-    run_dump_test "x86-64-merom"
+    run_dump_test "x86-64-ssse3"
     run_dump_test "x86-64-rep"
     run_dump_test "x86-64-rep-suffix"
     run_dump_test "x86-64-cbw"
@@ -256,7 +256,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-nops-1"
     run_dump_test "x86-64-nops-1-k8"
     run_dump_test "x86-64-nops-1-nocona"
-    run_dump_test "x86-64-nops-1-merom"
+    run_dump_test "x86-64-nops-1-core2"
     run_dump_test "x86-64-nops-1-pentium"
     run_dump_test "x86-64-nops-2"
     run_dump_test "x86-64-nops-3"

diff --git a/gas/testsuite/gas/i386/nops-1-merom.d b/gas/testsuite/gas/i386/nops-1-core2.d
similarity index 98%
rename from gas/testsuite/gas/i386/nops-1-merom.d
rename to gas/testsuite/gas/i386/nops-1-core2.d
index 90668e56f07b469e1c513a968dc987512f3020f6..58632d79e65edb3e119052d767892a359375ca5f 100644 (file)
--- a/gas/testsuite/gas/i386/nops-1-merom.d
+++ b/gas/testsuite/gas/i386/nops-1-core2.d
@@ -1,7 +1,7 @@
-#as: -mtune=merom
+#as: -mtune=core2
 #source: nops-1.s
 #objdump: -drw
-#name: i386 -mtune=merom nops 1
+#name: i386 -mtune=core2 nops 1
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/nops-2-merom.d b/gas/testsuite/gas/i386/nops-2-core2.d
similarity index 98%
rename from gas/testsuite/gas/i386/nops-2-merom.d
rename to gas/testsuite/gas/i386/nops-2-core2.d
index 6cf50d04e8ae2f4595d1e8ef4f36ca023c894171..ba7506dce618e544e7ea97e643446e2ee9a7b4d5 100644 (file)
--- a/gas/testsuite/gas/i386/nops-2-merom.d
+++ b/gas/testsuite/gas/i386/nops-2-core2.d
@@ -1,7 +1,7 @@
-#as: -march=i386 -mtune=merom
+#as: -march=i386 -mtune=core2
 #source: nops-2.s
 #objdump: -drw
-#name: i386 -march=i386 -mtune=merom nops 2
+#name: i386 -march=i386 -mtune=core2 nops 2
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/prescott.d b/gas/testsuite/gas/i386/sse3.d
similarity index 98%
rename from gas/testsuite/gas/i386/prescott.d
rename to gas/testsuite/gas/i386/sse3.d
index ed385096abfaf6f14dc74addc25baeeef4ea5185..73ea486e9e4bd336f636861c1aacf153fe77cca4 100644 (file)
--- a/gas/testsuite/gas/i386/prescott.d
+++ b/gas/testsuite/gas/i386/sse3.d
@@ -1,5 +1,5 @@
 #objdump: -dw
-#name: i386 prescott
+#name: i386 SSE3
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/prescott.s b/gas/testsuite/gas/i386/sse3.s
similarity index 96%
rename from gas/testsuite/gas/i386/prescott.s
rename to gas/testsuite/gas/i386/sse3.s
index 6049c9766ecfd61d4b22aa365092a58bb9e2ad89..051dfb08237fe0eda29dad4f9da0d5e49ac3b778 100644 (file)
--- a/gas/testsuite/gas/i386/prescott.s
+++ b/gas/testsuite/gas/i386/sse3.s
@@ -1,4 +1,4 @@
-#Prescott New Instructions
+# SSE3 New Instructions
 
        .text
 foo:

diff --git a/gas/testsuite/gas/i386/merom.d b/gas/testsuite/gas/i386/ssse3.d
similarity index 99%
rename from gas/testsuite/gas/i386/merom.d
rename to gas/testsuite/gas/i386/ssse3.d
index 9baa234e45fe183235c2d60af6775a23be65c47e..4be12fbd6c4d6dbba63046bd4d4033b23bbb4674 100644 (file)
--- a/gas/testsuite/gas/i386/merom.d
+++ b/gas/testsuite/gas/i386/ssse3.d
@@ -1,5 +1,5 @@
 #objdump: -dw
-#name: i386 merom
+#name: i386 SSSE3
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/merom.s b/gas/testsuite/gas/i386/ssse3.s
similarity index 98%
rename from gas/testsuite/gas/i386/merom.s
rename to gas/testsuite/gas/i386/ssse3.s
index 154d2f8ddb335ac5aa3d46c6636833e1f91bdfa9..4c81222a911dae58c86d02679331531b8edcfee9 100644 (file)
--- a/gas/testsuite/gas/i386/merom.s
+++ b/gas/testsuite/gas/i386/ssse3.s
@@ -1,4 +1,4 @@
-#Merom New Instructions
+# SSSE3 New Instructions
 
        .text
 foo:

diff --git a/gas/testsuite/gas/i386/x86-64-nops-1-merom.d b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
similarity index 98%
rename from gas/testsuite/gas/i386/x86-64-nops-1-merom.d
rename to gas/testsuite/gas/i386/x86-64-nops-1-core2.d
index b6c7732329178ca7babec4da25828b35b95a8c06..9f28894a09542a33dde08564f443cf10498afe36 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-nops-1-merom.d
+++ b/gas/testsuite/gas/i386/x86-64-nops-1-core2.d
@@ -1,7 +1,7 @@
-#as: -mtune=merom
+#as: -mtune=core2
 #source: nops-1.s
 #objdump: -drw
-#name: x86-64 -mtune=merom nops 1
+#name: x86-64 -mtune=core2 nops 1
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/x86-64-prescott.d b/gas/testsuite/gas/i386/x86-64-sse3.d
similarity index 98%
rename from gas/testsuite/gas/i386/x86-64-prescott.d
rename to gas/testsuite/gas/i386/x86-64-sse3.d
index 2ceba67481cfe9d5f346d69345084f373518d9f3..c6c25422ae321de37bee5e27cb1821cee8529a7b 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-prescott.d
+++ b/gas/testsuite/gas/i386/x86-64-sse3.d
@@ -1,5 +1,5 @@
 #objdump: -dw
-#name: x86-64 prescott
+#name: x86-64 SSE3
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/x86-64-prescott.s b/gas/testsuite/gas/i386/x86-64-sse3.s
similarity index 95%
rename from gas/testsuite/gas/i386/x86-64-prescott.s
rename to gas/testsuite/gas/i386/x86-64-sse3.s
index 123a3e9702d0c4914d1c8c5e4c2ff571ed34674f..6d04afddb8c7173d554fbdbe40b497e68b870111 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-prescott.s
+++ b/gas/testsuite/gas/i386/x86-64-sse3.s
@@ -1,4 +1,4 @@
-#Prescott New Instructions
+# 64bit SSE3 New Instructions
 
        .text
 foo:

diff --git a/gas/testsuite/gas/i386/x86-64-merom.d b/gas/testsuite/gas/i386/x86-64-ssse3.d
similarity index 99%
rename from gas/testsuite/gas/i386/x86-64-merom.d
rename to gas/testsuite/gas/i386/x86-64-ssse3.d
index 4593e526ef2529a279d58fafe76f99f358049dfe..f8a8142c054b579c4f3a2e9f6b871550022c2843 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-merom.d
+++ b/gas/testsuite/gas/i386/x86-64-ssse3.d
@@ -1,5 +1,5 @@
 #objdump: -dw
-#name: x86-64 merom
+#name: x86-64 SSSE3
 
 .*: +file format .*
 

diff --git a/gas/testsuite/gas/i386/x86-64-merom.s b/gas/testsuite/gas/i386/x86-64-ssse3.s
similarity index 97%
rename from gas/testsuite/gas/i386/x86-64-merom.s
rename to gas/testsuite/gas/i386/x86-64-ssse3.s
index a70654db3e13c86228893244f443cfe4140110cd..f298ba6d55fe07f663801d04859afd5140292f42 100644 (file)
--- a/gas/testsuite/gas/i386/x86-64-merom.s
+++ b/gas/testsuite/gas/i386/x86-64-ssse3.s
@@ -1,4 +1,4 @@
-#Merom New Instructions
+# 64bit SSSE3 New Instructions
 
        .text
 foo: