# HG changeset patch
# Parent  e9edce3b659de9093e265b4f0c544ec7d188143f
Specify architecture for SPARC gas tests

diff --git a/gas/testsuite/gas/sparc/sparc.exp b/gas/testsuite/gas/sparc/sparc.exp
--- a/gas/testsuite/gas/sparc/sparc.exp
+++ b/gas/testsuite/gas/sparc/sparc.exp
@@ -31,6 +31,20 @@ proc gas_64_check { } {
     return [regexp "elf64\[_-\]sparc" [lindex $status 1]]
 }
 
+# Until binutils support Solaris-style capabilities, specify the arch
+# necessary to disassemble the ISA extensions used.
+proc set_tests_arch {arch} {
+    global OBJDUMPFLAGS
+
+    if [istarget "sparc*-*-solaris*"] {
+	if { $arch != "" } {
+	    set OBJDUMPFLAGS "-msparc:$arch"
+	} else {
+	    set OBJDUMPFLAGS ""
+	}
+    }
+}
+
 if [istarget sparc*-*-*] {
 
     if [is_elf_format] {
@@ -50,40 +64,53 @@ if [istarget sparc*-*-*] {
         run_list_test "pr4587" ""
         run_dump_test "ticc-imm-reg"
         run_dump_test "v8-movwr-imm"
-        run_dump_test "pause"
         run_dump_test "save-args"
-        run_dump_test "cbcond"
+
+	set_tests_arch "v9c"
+	run_dump_test "ldtxa"
+
+	set_tests_arch "v9d"
+	run_dump_test "edge"
+
+	set_tests_arch "v9v"
+	run_dump_test "cbcond"
+	run_dump_test "cfr"
+	run_dump_test "crypto"
+	run_dump_test "hpcvis3"
+	run_dump_test "ima"
+	run_dump_test "pause"
+
+	set_tests_arch "v9m"
+	run_dump_test "mcdper"
+	run_dump_test "mwait"
+	run_dump_test "sparc5vis4"
+	run_dump_test "xcrypto"
+
+	set_tests_arch "v9m8"
+	run_dump_test "fpcmpshl"
+	run_dump_test "ldm-stm"
+	run_dump_test "ldmf-stmf"
+	run_dump_test "on"
+	run_dump_test "rle"
+	run_dump_test "sparc6"
+	set_tests_arch ""
+
         run_list_test "cbcond-diag" "-64"
-        run_dump_test "cfr"
-        run_dump_test "crypto"
-        run_dump_test "edge"
         run_dump_test "flush"
-        run_dump_test "hpcvis3"
-        run_dump_test "ima"
         run_dump_test "ld_st_fsr"
         run_dump_test "ldtw_sttw"
         run_dump_test "ldd_std"
         run_dump_test "ldx_stx"
         run_dump_test "ldx_efsr"
-        run_dump_test "mwait"
-        run_dump_test "mcdper"
-        run_dump_test "sparc5vis4"
-        run_dump_test "xcrypto"
         run_dump_test "v9branch1"
         run_dump_test "imm-plus-rreg"
         run_dump_test "dcti-couples-v9"
         run_dump_test "call-relax"
-        run_dump_test "sparc6"
         run_list_test "sparc6-diag" "-64"
-        run_dump_test "fpcmpshl"
         run_list_test "fpcmpshl-diag" "-64"
-        run_dump_test "ldm-stm"
         run_list_test "ldm-stm-diag" "-64"
-        run_dump_test "ldmf-stmf"
         run_list_test "ldmf-stmf-diag" "-64"
-        run_dump_test "on"
         run_list_test "on-diag" "-64"
-        run_dump_test "rle"
     } else {
         # The next tests are a.out only.
         run_dump_test "call-relax-aout"
@@ -95,12 +122,6 @@ if [istarget sparc*-*-*] {
 	run_dump_test "prefetch"
 	run_dump_test "set64"
 	run_dump_test "synth64"
-        run_dump_test "rdasr"
-	run_dump_test "rdpr"
-	run_dump_test "rdhpr"
-        run_dump_test "wrasr"
-	run_dump_test "wrpr"
-	run_dump_test "wrhpr"
 	run_dump_test "window"
 	run_dump_test "reloc64"
 	run_dump_test "pcrel64"
@@ -109,6 +130,17 @@ if [istarget sparc*-*-*] {
         run_list_test "hwcaps-bump" "-64 -bump"
         run_list_test "asi-bump-warn" "-64 -bump"
         run_list_test "asi-arch-error" "-Av9"
+
+	set_tests_arch "v9m"
+	run_dump_test "rdhpr"
+	run_dump_test "rdpr"
+	run_dump_test "wrasr"
+	run_dump_test "wrhpr"
+	run_dump_test "wrpr"
+
+	set_tests_arch "v9m8"
+	run_dump_test "rdasr"
+	set_tests_arch ""
     }
 
     run_dump_test "synth"