From b0bd097ef63edac71b6720e850b9a04605a87f7f Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@imgtec.com>
Date: Tue, 27 Jun 2017 04:23:54 +0100
Subject: MIPS/GAS/testsuite: Run SAVE/RESTORE tests across all MIPS16e
 architectures

	gas/
	* testsuite/gas/mips/mips16e-save.d: Remove `-mmips:isa32
	-mmips:16' from `objdump' flags and `-march=mips32 -mips16' from
	`as' flags.
	* testsuite/gas/mips/mips16e-save-err.d: Remove `-march=mips32'
	from `as' flags.
	* testsuite/gas/mips/mips16e-save.s: Remove the `.set mips16'
	pseudo-op.
	* testsuite/gas/mips/mips16e-save-err.s: Likewise.
	* testsuite/gas/mips/mips.exp: Run SAVE/RESTORE tests across all
	MIPS16e architectures.
---
 gas/ChangeLog                             | 13 +++++++++++++
 gas/testsuite/gas/mips/mips.exp           |  5 +++--
 gas/testsuite/gas/mips/mips16e-save-err.d |  2 +-
 gas/testsuite/gas/mips/mips16e-save-err.s |  2 +-
 gas/testsuite/gas/mips/mips16e-save.d     |  4 ++--
 gas/testsuite/gas/mips/mips16e-save.s     |  1 -
 6 files changed, 20 insertions(+), 7 deletions(-)

(limited to 'gas')

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 160e307..37d45b8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,18 @@
 2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
 
+	* testsuite/gas/mips/mips16e-save.d: Remove `-mmips:isa32
+	-mmips:16' from `objdump' flags and `-march=mips32 -mips16' from
+	`as' flags.
+	* testsuite/gas/mips/mips16e-save-err.d: Remove `-march=mips32'
+	from `as' flags.
+	* testsuite/gas/mips/mips16e-save.s: Remove the `.set mips16'
+	pseudo-op.
+	* testsuite/gas/mips/mips16e-save-err.s: Likewise.
+	* testsuite/gas/mips/mips.exp: Run SAVE/RESTORE tests across all
+	MIPS16e architectures.
+
+2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
+
 	* testsuite/gas/mips/mips16e-save-err.d: New test.
 	* gas/testsuite/gas/mips/mips.exp: Fold `mips16e-save-err' list
 	test into the new test.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index e5973d8..b978704 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1383,8 +1383,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips16-stabs"
 
     run_dump_test "mips16e-jrc"
-    run_dump_test "mips16e-save"
-    run_dump_test "mips16e-save-err"
+    run_dump_test_arches "mips16e-save"	[mips_arch_list_matching mips16e-32]
+    run_dump_test_arches "mips16e-save-err" \
+					[mips_arch_list_matching mips16e-32]
     run_dump_test "mips16e2-lui"
 
     run_dump_test "mips16-intermix"
diff --git a/gas/testsuite/gas/mips/mips16e-save-err.d b/gas/testsuite/gas/mips/mips16e-save-err.d
index 77bd966..fd6b9ca 100644
--- a/gas/testsuite/gas/mips/mips16e-save-err.d
+++ b/gas/testsuite/gas/mips/mips16e-save-err.d
@@ -1,3 +1,3 @@
 #name: MIPS16e SAVE/RESTORE errors
-#as: -march=mips32 -32
+#as: -32
 #error-output: mips16e-save-err.l
diff --git a/gas/testsuite/gas/mips/mips16e-save-err.s b/gas/testsuite/gas/mips/mips16e-save-err.s
index afed6c6..7642235 100644
--- a/gas/testsuite/gas/mips/mips16e-save-err.s
+++ b/gas/testsuite/gas/mips/mips16e-save-err.s
@@ -1,4 +1,4 @@
-	.set	mips16
+
 	save	$3,100		# error
 	save	$4		# error
 	save	$4,100,200	# error
diff --git a/gas/testsuite/gas/mips/mips16e-save.d b/gas/testsuite/gas/mips/mips16e-save.d
index 7ce628c..792b99a 100644
--- a/gas/testsuite/gas/mips/mips16e-save.d
+++ b/gas/testsuite/gas/mips/mips16e-save.d
@@ -1,5 +1,5 @@
-#objdump: -dr -mmips:isa32 -mmips:16
-#as: -march=mips32 -mips16 -32
+#objdump: -dr
+#as: -32
 #name: MIPS16e SAVE/RESTORE
 
 .*: +file format .*mips.*
diff --git a/gas/testsuite/gas/mips/mips16e-save.s b/gas/testsuite/gas/mips/mips16e-save.s
index b982cc7..5a2e9cb 100644
--- a/gas/testsuite/gas/mips/mips16e-save.s
+++ b/gas/testsuite/gas/mips/mips16e-save.s
@@ -1,6 +1,5 @@
 # Test the generation of the mips16e save instruction
 
-	.set	mips16
 	.text
 func:
 # Un-extended version
-- 
cgit v1.1