[ gas/testsuite/ChangeLog ]

2002-12-30  Chris Demetriou  <cgd@broadcom.com>

	* gas/mips/elf_arch_mips1.d: New test.
	* gas/mips/elf_arch_mips2.d: New test.
	* gas/mips/elf_arch_mips3.d: New test.
	* gas/mips/elf_arch_mips4.d: New test.
	* gas/mips/elf_arch_mips5.d: New test.
	* gas/mips/elf_arch_mips32.d: New test.
	* gas/mips/elf_arch_mips32r2.d: New test.
	* gas/mips/elf_arch_mips64.d: New test.
	* gas/mips/empty.s: New test source file.
	* gas/mips/mips.exp: Run new tests.

	* gas/mips/elf_ase_mips16.d: Change to use empty.s
	* gas/mips/elf_ase_mips16.s: Remove.

13 files changed, 96 insertions, 4 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d902d9f..48b0149 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,21 @@
 2002-12-30  Chris Demetriou  <cgd@broadcom.com>
 
+	* gas/mips/elf_arch_mips1.d: New test.
+	* gas/mips/elf_arch_mips2.d: New test.
+	* gas/mips/elf_arch_mips3.d: New test.
+	* gas/mips/elf_arch_mips4.d: New test.
+	* gas/mips/elf_arch_mips5.d: New test.
+	* gas/mips/elf_arch_mips32.d: New test.
+	* gas/mips/elf_arch_mips32r2.d: New test.
+	* gas/mips/elf_arch_mips64.d: New test.
+	* gas/mips/empty.s: New test source file.
+	* gas/mips/mips.exp: Run new tests.
+
+	* gas/mips/elf_ase_mips16.d: Change to use empty.s
+	* gas/mips/elf_ase_mips16.s: Remove.
+
+2002-12-30  Chris Demetriou  <cgd@broadcom.com>
+
 	* gas/mips/cp0-names-mips32r2.d: New test.
 	* gas/mips/hwr-names-mips32r2.d: New test.
 	* gas/mips/hwr-names-numeric.d: New test.
diff --git a/gas/testsuite/gas/mips/elf_arch_mips1.d b/gas/testsuite/gas/mips/elf_arch_mips1.d
new file mode 100644
index 0000000..14a227e
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips1.d
@@ -0,0 +1,10 @@
+# name: ELF MIPS1 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips1
+
+.*:.*file format.*elf.*mips.*
+# Note: objdump omits leading zeros, so must check for the fact that
+# flags are _not_ 8 chars long.
+private flags = (.......|......|.....|....|...|..|.): .*\[mips1\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips2.d b/gas/testsuite/gas/mips/elf_arch_mips2.d
new file mode 100644
index 0000000..3f72604
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips2.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS2 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips2
+
+.*:.*file format.*elf.*mips.*
+private flags = 1.......: .*\[mips2\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips3.d b/gas/testsuite/gas/mips/elf_arch_mips3.d
new file mode 100644
index 0000000..c46488c
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips3.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS3 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips3
+
+.*:.*file format.*elf.*mips.*
+private flags = 2.......: .*\[mips3\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips32.d b/gas/testsuite/gas/mips/elf_arch_mips32.d
new file mode 100644
index 0000000..c242506
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips32.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS32 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips32
+
+.*:.*file format.*elf.*mips.*
+private flags = 5.......: .*\[mips32\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips32r2.d b/gas/testsuite/gas/mips/elf_arch_mips32r2.d
new file mode 100644
index 0000000..5491205
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips32r2.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS32r2 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips32r2
+
+.*:.*file format.*elf.*mips.*
+private flags = 7.......: .*\[mips32r2\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips4.d b/gas/testsuite/gas/mips/elf_arch_mips4.d
new file mode 100644
index 0000000..8dc52bf
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips4.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS4 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips4
+
+.*:.*file format.*elf.*mips.*
+private flags = 3.......: .*\[mips4\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips5.d b/gas/testsuite/gas/mips/elf_arch_mips5.d
new file mode 100644
index 0000000..d38b02c
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips5.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS5 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips5
+
+.*:.*file format.*elf.*mips.*
+private flags = 4.......: .*\[mips5\].*
+
diff --git a/gas/testsuite/gas/mips/elf_arch_mips64.d b/gas/testsuite/gas/mips/elf_arch_mips64.d
new file mode 100644
index 0000000..52c8927
--- /dev/null
+++ b/gas/testsuite/gas/mips/elf_arch_mips64.d
@@ -0,0 +1,8 @@
+# name: ELF MIPS64 markings
+# source: empty.s
+# objdump: -p
+# as: -march=mips64
+
+.*:.*file format.*elf.*mips.*
+private flags = 6.......: .*\[mips64\].*
+
diff --git a/gas/testsuite/gas/mips/elf_ase_mips16.d b/gas/testsuite/gas/mips/elf_ase_mips16.d
index df746b9..82887f7 100644
--- a/gas/testsuite/gas/mips/elf_ase_mips16.d
+++ b/gas/testsuite/gas/mips/elf_ase_mips16.d
@@ -1,5 +1,5 @@
 # name: ELF MIPS16 ASE markings
-# source: elf_ase_mips16.s
+# source: empty.s
 # objdump: -p
 # as: -mips16
 
diff --git a/gas/testsuite/gas/mips/elf_ase_mips16.s b/gas/testsuite/gas/mips/elf_ase_mips16.s
deleted file mode 100644
index cf5b2e5..0000000
--- a/gas/testsuite/gas/mips/elf_ase_mips16.s
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test of MIPS16 ASE file markings.
-
-	# no actual contents necessary!
diff --git a/gas/testsuite/gas/mips/empty.s b/gas/testsuite/gas/mips/empty.s
new file mode 100644
index 0000000..f30bd3c
--- /dev/null
+++ b/gas/testsuite/gas/mips/empty.s
@@ -0,0 +1,3 @@
+# An empty source file for tests that need no instructions.
+
+	# No actual contents necessary!
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index d6ebe4e..256d6cb 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -563,6 +563,16 @@ if { [istarget mips*-*-*] } then {
 	run_dump_test "elf_e_flags3"
 	run_dump_test "elf_e_flags4"
 
+	# Check EF_MIPS_ARCH markings for each supported architecture.
+	run_dump_test "elf_arch_mips1"
+	run_dump_test "elf_arch_mips2"
+	run_dump_test "elf_arch_mips3"
+	run_dump_test "elf_arch_mips4"
+	run_dump_test "elf_arch_mips5"
+	run_dump_test "elf_arch_mips32"
+	run_dump_test "elf_arch_mips32r2"
+	run_dump_test "elf_arch_mips64"
+
 	# Verify that ASE markings are handled properly.
 	if { !$no_mips16 } { run_dump_test "elf_ase_mips16" }