gas/

2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>

	* config/tc-i386.c (i386_target_format): Remove cpummx2.

gas/testsuite/

2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>

	* gas/i386/arch-10.d: New.
	* gas/i386/arch-11.s: Likewise.
	* gas/i386/arch-12.d: Likewise.
	* gas/i386/arch-12.s: Likewise.

	* gas/i386/i386.exp: Run arch-11 and arch-12.

opcodes/

2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>

	* i386-gen.c (cpu_flag_init): Remove CpuMMX2.
	(cpu_flags): Likewise.

	* i386-opc.h (CpuMMX2): Removed.
	(CpuSSE): Updated.

	* i386-opc.tbl: Replace CpuMMX2 with CpuSSE|Cpu3dnowA.
	* i386-init.h: Regenerated.
	* i386-tbl.h: Likewise.

8 files changed, 47 insertions, 2 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ed7009f..11ca59b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* config/tc-i386.c (i386_target_format): Remove cpummx2.
+
+2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* config/tc-i386.c (XXX_PREFIX): Moved from tc-i386.h.
 	(XXX_MNEM_SUFFIX): Likewise.
 	(END_OF_INSN): Likewise.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 28d37a8..2724d07 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -7445,7 +7445,6 @@ i386_target_format (void)
 	  cpu_arch_isa_flags.bitfield.cpui686 = 1;
 	  cpu_arch_isa_flags.bitfield.cpup4 = 1;
 	  cpu_arch_isa_flags.bitfield.cpummx= 1;
-	  cpu_arch_isa_flags.bitfield.cpummx2 = 1;
 	  cpu_arch_isa_flags.bitfield.cpusse = 1;
 	  cpu_arch_isa_flags.bitfield.cpusse2 = 1;
 	}
@@ -7459,7 +7458,6 @@ i386_target_format (void)
 	  cpu_arch_tune_flags.bitfield.cpui686 = 1;
 	  cpu_arch_tune_flags.bitfield.cpup4 = 1;
 	  cpu_arch_tune_flags.bitfield.cpummx= 1;
-	  cpu_arch_tune_flags.bitfield.cpummx2 = 1;
 	  cpu_arch_tune_flags.bitfield.cpusse = 1;
 	  cpu_arch_tune_flags.bitfield.cpusse2 = 1;
 	}
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index dc1721c..d831693 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,14 @@
 2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* gas/i386/arch-10.d: New.
+	* gas/i386/arch-11.s: Likewise.
+	* gas/i386/arch-12.d: Likewise.
+	* gas/i386/arch-12.s: Likewise.
+
+	* gas/i386/i386.exp: Run arch-11 and arch-12.
+
+2008-01-22  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* gas/i386/arch-10-1.l: New.
 	* gas/i386/arch-10-1.s: Likewise.
 	* gas/i386/arch-10-2.l: Likewise.
diff --git a/gas/testsuite/gas/i386/arch-11.d b/gas/testsuite/gas/i386/arch-11.d
new file mode 100644
index 0000000..361bcc2
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-11.d
@@ -0,0 +1,11 @@
+#objdump: -dw
+#name: i386 arch 11
+
+.*:     file format .*
+
+Disassembly of section .text:
+
+0+ <.text>:
+[ 	]*[a-f0-9]+:	f3 0f 5e c1          	divss  %xmm1,%xmm0
+[ 	]*[a-f0-9]+:	0f da c1             	pminub %mm1,%mm0
+#pass
diff --git a/gas/testsuite/gas/i386/arch-11.s b/gas/testsuite/gas/i386/arch-11.s
new file mode 100644
index 0000000..0ecbe1c
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-11.s
@@ -0,0 +1,5 @@
+# Test .arch .sse
+.arch generic32
+.arch .sse
+divss %xmm1,%xmm0
+pminub %mm1,%mm0
diff --git a/gas/testsuite/gas/i386/arch-12.d b/gas/testsuite/gas/i386/arch-12.d
new file mode 100644
index 0000000..aeec457
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-12.d
@@ -0,0 +1,11 @@
+#objdump: -dw
+#name: i386 arch 12
+
+.*:     file format .*
+
+Disassembly of section .text:
+
+0+ <.text>:
+[ 	]*[a-f0-9]+:	0f 0f c1 bb          	pswapd %mm1,%mm0
+[ 	]*[a-f0-9]+:	0f da c1             	pminub %mm1,%mm0
+#pass
diff --git a/gas/testsuite/gas/i386/arch-12.s b/gas/testsuite/gas/i386/arch-12.s
new file mode 100644
index 0000000..03d57c5
--- /dev/null
+++ b/gas/testsuite/gas/i386/arch-12.s
@@ -0,0 +1,5 @@
+# Test .arch .sse
+.arch generic32
+.arch .3dnowa
+pswapd %mm1,%mm0
+pminub %mm1,%mm0
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index 9569f13..78b80a2 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -112,6 +112,8 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_list_test "arch-10-2" "-march=i686 -I${srcdir}/$subdir -al"
     run_list_test "arch-10-3" "-march=i686+sse4.2 -I${srcdir}/$subdir -al"
     run_list_test "arch-10-4" "-march=i686+sse4+vmx+smx -I${srcdir}/$subdir -al"
+    run_dump_test "arch-11"
+    run_dump_test "arch-12"
 
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.