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.

13 files changed, 46 insertions, 21 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fa5023f5590..3b799430b1b 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,30 @@
 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
 	* gas/i386/disp.d: New.
 	* gas/i386/disp.s: Likewise.
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index fc6748200e8..c93ebc20fbf 100644
--- 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
index 90668e56f07..58632d79e65 100644
--- 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
index 6cf50d04e8a..ba7506dce61 100644
--- 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
index ed385096abf..73ea486e9e4 100644
--- 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
index 6049c9766ec..051dfb08237 100644
--- 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
index 9baa234e45f..4be12fbd6c4 100644
--- 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
index 154d2f8ddb3..4c81222a911 100644
--- 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
index b6c77323291..9f28894a095 100644
--- 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
index 2ceba67481c..c6c25422ae3 100644
--- 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
index 123a3e9702d..6d04afddb8c 100644
--- 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
index 4593e526ef2..f8a8142c054 100644
--- 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
index a70654db3e1..f298ba6d55f 100644
--- 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: