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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 160e3072c034e00e0bdba67806f17af989ba56fd..37d45b8abb9c48c7f85749452ad645ee8478f272 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,16 @@
+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.

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index e5973d8fc1c205a5c586f8e7a8398c2f155b889a..b9787045b9d6838c9d3652d18834f1f819d7bb78 100644 (file)
--- 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 77bd9668b5aaea6bf4151bd56c863b94769d43a3..fd6b9cadbe19a356fef120a97999c95e333810e3 100644 (file)
--- 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 afed6c6128c415d97b6f8820207b24f3531bb803..7642235c42c1ef1a344d19aab19473f092a840eb 100644 (file)
--- 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 7ce628cc16cf26f5fe3c38f631a53bc7e25a59fb..792b99ae51ac67594fc2a566e809b43e6b1813bf 100644 (file)
--- 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 b982cc7afbf73c49cb4783dc432175e7f0ce307f..5a2e9cb367aabf119486bff28e20b145837bc767 100644 (file)
--- 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