MIPS/GAS/testsuite: Drop the `mips16e-' prefix from SAVE/RESTORE tests

[deliverable/binutils-gdb.git] / gas / testsuite / gas / mips / mips.exp

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 7b20b4cb6206b5fa989d38d4e5fe0e3f28115e22..2e3b3d58c08352d2852e4383713ebbc1c3c1330f 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1376,6 +1376,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips64-dsp"
     run_dump_test "mips32-mt"
 
+    run_dump_test_arches "save"                [mips_arch_list_matching mips16e-32]
+    run_dump_test_arches "save-err"    [mips_arch_list_matching mips16e-32]
+
     run_dump_test "mips16-dwarf2"
     if $has_newabi {
        run_dump_test "mips16-dwarf2-n32"
@@ -1383,8 +1386,6 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips16-stabs"
 
     run_dump_test "mips16e-jrc"
-    run_dump_test "mips16e-save"
-    run_list_test "mips16e-save-err" "-march=mips32 -32"
     run_dump_test "mips16e2-lui"
 
     run_dump_test "mips16-intermix"
@@ -1567,79 +1568,137 @@ if { [istarget mips*-*-vxworks*] } {
     run_list_test "pcrel-reloc-6" "-32 --defsym offset=4" \
        "MIPS local PC-relative relocations 6b"
 
-    run_dump_test "mips16-pcrel-0"
-    run_dump_test "mips16-pcrel-1"
-    run_dump_test "mips16-pcrel-2"
-    run_dump_test "mips16-pcrel-3"
-    run_dump_test "mips16-pcrel-4"
-    run_dump_test "mips16-pcrel-5"
-    run_dump_test "mips16-pcrel-pic-0"
-    run_dump_test "mips16-pcrel-pic-1"
+    run_dump_test_arches "mips16-pcrel-0" [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-1" [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-2" [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-3" [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-4" [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-5" [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-pic-0" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-pic-1" \
+                                       [mips_arch_list_matching mips16-64]
     if $has_newabi {
-       run_dump_test "mips16-pcrel-n32-0"
-       run_dump_test "mips16-pcrel-n32-1"
-       run_dump_test "mips16-pcrel-n64-sym32-0"
-       run_dump_test "mips16-pcrel-n64-sym32-1"
-       run_dump_test "mips16-pcrel-n64-0"
-       run_dump_test "mips16-pcrel-n64-1"
-    }
-    run_dump_test "mips16-pcrel-delay-0"
-    run_dump_test "mips16-pcrel-delay-1"
+       run_dump_test_arches "mips16-pcrel-n32-0" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-n32-1" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-n64-sym32-0" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-n64-sym32-1" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-n64-0" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-n64-1" \
+                                       [mips_arch_list_matching mips16-64]
+    }
+    run_dump_test_arches "mips16-pcrel-delay-0" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-delay-1" \
+                                       [mips_arch_list_matching mips16-32]
     run_dump_test "mips16-pcrel-relax-0"
     run_dump_test "mips16-pcrel-relax-1"
     run_dump_test "mips16-pcrel-relax-2"
     run_dump_test "mips16-pcrel-relax-3"
-    run_dump_test "mips16-pcrel-reloc-0"
-    run_dump_test "mips16-pcrel-reloc-1"
-    run_dump_test "mips16-pcrel-reloc-2"
-    run_dump_test "mips16-pcrel-reloc-3"
-    run_dump_test "mips16-pcrel-reloc-4"
-    run_dump_test "mips16-pcrel-reloc-5"
-    run_dump_test "mips16-pcrel-reloc-6"
-    run_dump_test "mips16-pcrel-reloc-7"
-    run_dump_test "mips16-pcrel-addend-0"
-    run_dump_test "mips16-pcrel-addend-1"
-    run_dump_test "mips16-pcrel-addend-2"
-    run_dump_test "mips16-pcrel-addend-3"
-    run_dump_test "mips16-pcrel-addend-4"
-    run_dump_test "mips16-pcrel-addend-5"
-    run_dump_test "mips16-pcrel-addend-6"
-    run_dump_test "mips16-pcrel-addend-7"
-    run_dump_test "mips16-pcrel-addend-8"
-    run_dump_test "mips16-pcrel-addend-9"
-    run_dump_test "mips16-pcrel-addend-pic-8"
-    run_dump_test "mips16-pcrel-addend-pic-9"
+    run_dump_test_arches "mips16-pcrel-reloc-0" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-reloc-1" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-reloc-2" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-reloc-3" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-reloc-4" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-reloc-5" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-reloc-6" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-reloc-7" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-addend-0" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-addend-1" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-addend-2" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-addend-3" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-addend-4" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-addend-5" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-addend-6" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-addend-7" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-addend-8" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-addend-9" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-addend-pic-8" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-addend-pic-9" \
+                                       [mips_arch_list_matching mips16-64]
     if $has_newabi {
-       run_dump_test "mips16-pcrel-addend-n32-8"
-       run_dump_test "mips16-pcrel-addend-n32-9"
-       run_dump_test "mips16-pcrel-addend-n64-sym32-8"
-       run_dump_test "mips16-pcrel-addend-n64-sym32-9"
-       run_dump_test "mips16-pcrel-addend-n64-8"
-       run_dump_test "mips16-pcrel-addend-n64-9"
-    }
-    run_dump_test "mips16-pcrel-absolute"
-    run_dump_test "mips16-pcrel-absolute-1"
-    run_dump_test "mips16-pcrel-absolute-2"
-    run_dump_test "mips16-pcrel-absolute-3"
-    run_dump_test "mips16-pcrel-absolute-4"
-    run_dump_test "mips16-pcrel-absolute-5"
-    run_dump_test "mips16-pcrel-absolute-6"
-    run_dump_test "mips16-pcrel-absolute-7"
-    run_dump_test "mips16-pcrel-absolute-pic-4"
-    run_dump_test "mips16-pcrel-absolute-pic-6"
+       run_dump_test_arches "mips16-pcrel-addend-n32-8" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-addend-n32-9" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-addend-n64-sym32-8" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-addend-n64-sym32-9" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-addend-n64-8" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-addend-n64-9" \
+                                       [mips_arch_list_matching mips16-64]
+    }
+    run_dump_test_arches "mips16-pcrel-absolute" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-absolute-1" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-absolute-2" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-absolute-3" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-absolute-4" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-absolute-5" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-absolute-6" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-absolute-7" \
+                                       [mips_arch_list_matching mips16-64]
+    run_dump_test_arches "mips16-pcrel-absolute-pic-4" \
+                                       [mips_arch_list_matching mips16-32]
+    run_dump_test_arches "mips16-pcrel-absolute-pic-6" \
+                                       [mips_arch_list_matching mips16-64]
     if $has_newabi {
-       run_dump_test "mips16-pcrel-absolute-n32-4"
-       run_dump_test "mips16-pcrel-absolute-n32-6"
-       run_dump_test "mips16-pcrel-absolute-n64-4"
-       run_dump_test "mips16-pcrel-absolute-n64-6"
-       run_dump_test "mips16-pcrel-absolute-n64-sym32-4"
-       run_dump_test "mips16-pcrel-absolute-n64-sym32-6"
-       run_dump_test "mips16-pcrel-absolute-pic-n32-4"
-       run_dump_test "mips16-pcrel-absolute-pic-n32-6"
-       run_dump_test "mips16-pcrel-absolute-pic-n64-4"
-       run_dump_test "mips16-pcrel-absolute-pic-n64-6"
-       run_dump_test "mips16-pcrel-absolute-pic-n64-sym32-4"
-       run_dump_test "mips16-pcrel-absolute-pic-n64-sym32-6"
+       run_dump_test_arches "mips16-pcrel-absolute-n32-4" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-n32-6" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-n64-4" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-n64-6" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-n64-sym32-4" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-n64-sym32-6" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-pic-n32-4" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-pic-n32-6" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-pic-n64-4" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-pic-n64-6" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-pic-n64-sym32-4" \
+                                       [mips_arch_list_matching mips16-64]
+       run_dump_test_arches "mips16-pcrel-absolute-pic-n64-sym32-6" \
+                                       [mips_arch_list_matching mips16-64]
     }
     run_dump_test "mips16-branch-reloc-0"
     run_dump_test "mips16-branch-reloc-1"