* gas/elf.exp: Don't run for sh64*-*-linux*, because it sets the

lsb in SHmedia code addresses.
* gas/sh/basic.exp: Force SHcompact for sh64*-*-linux* to enable
recognition of SH-1/2/3/4 instructions.
(proc do_fp): Do not run dsp tests for sh64*-*-linux*.
* gas/sh/sh64/abi-32.d: Adjust expected output to include
sh64*-*-linux* formats too.
* gas/sh/sh64/abi-64.d, gas/sh/sh64/basic-1.d,
gas/sh/sh64/case-1.d, gas/sh/sh64/case-noexp-1.d,
gas/sh/sh64/crange1-1.d, gas/sh/sh64/crange1-2.d,
gas/sh/sh64/crange2-1.d, gas/sh/sh64/crange2-2.d,
sh/sh64/crange2-noexp-1.d, gas/sh/sh64/crange3-1.d,
gas/sh/sh64/crange4-1.d, gas/sh/sh64/crange5-1.d,
gas/sh/sh64/creg-1.d, gas/sh/sh64/creg-2.d, gas/sh/sh64/datal-2.d,
gas/sh/sh64/datal32-1.d, gas/sh/sh64/datal32-3.d,
gas/sh/sh64/datal64-1.d, gas/sh/sh64/datal64-3.d,
gas/sh/sh64/endian-1.d, gas/sh/sh64/endian-2.d,
gas/sh/sh64/err-noexp-cmd1.s, gas/sh/sh64/immexpr32-1.d,
gas/sh/sh64/immexpr32-2.d, gas/sh/sh64/immexpr64-1.d,
gas/sh/sh64/immexpr64-2.d, gas/sh/sh64/lineno.d,
gas/sh/sh64/localcom-1.d, gas/sh/sh64/mix-1.d,
gas/sh/sh64/mix-noexp-1.d, gas/sh/sh64/movi-3.d,
gas/sh/sh64/movi32-1.d, gas/sh/sh64/movi32-2.d,
gas/sh/sh64/movi32-noexp-2.d, gas/sh/sh64/movi64-1.d,
gas/sh/sh64/movi64-2.d, gas/sh/sh64/movi64-3.d,
gas/sh/sh64/movi64-noexp-2.d, gas/sh/sh64/pt-1.d,
gas/sh/sh64/pt-noexp-1.d, gas/sh/sh64/pt32-1.d,
gas/sh/sh64/pt32-noexp-2.d, gas/sh/sh64/pt64-1.d,
gas/sh/sh64/pt64-32-1.d, gas/sh/sh64/pt64-32-2.d,
gas/sh/sh64/pt64-noexp-2.d, gas/sh/sh64/ptc32-1.d,
gas/sh/sh64/ptc32-noexp-1.d, gas/sh/sh64/ptc64-1.d,
gas/sh/sh64/ptc64-32-1.d, gas/sh/sh64/ptc64-noexp-1.d,
gas/sh/sh64/ptext32-1.d, gas/sh/sh64/ptext32-noexp-1.d,
gas/sh/sh64/ptext64-1.d, gas/sh/sh64/ptext64-32-1.d,
gas/sh/sh64/ptext64-noexp-1.d, gas/sh/sh64/rel32-1.d,
gas/sh/sh64/rel32-2.d, gas/sh/sh64/rel32-3.d,
gas/sh/sh64/rel32-4.d, gas/sh/sh64/rel32-5.d,
gas/sh/sh64/rel64-1.d, gas/sh/sh64/rel64-2.d,
gas/sh/sh64/rel64-3.d, gas/sh/sh64/rel64-4.d,
gas/sh/sh64/rel64-5.d, gas/sh/sh64/relax-1.d,
gas/sh/sh64/relax-2.d, gas/sh/sh64/relax-3.d,
gas/sh/sh64/shift32-1.d, gas/sh/sh64/shift32-3.d,
gas/sh/sh64/shift32-noexp-3.d, gas/sh/sh64/shift64-1.d,
gas/sh/sh64/shift64-2.d, gas/sh/sh64/shift64-3.d,
gas/sh/sh64/shift64-noexp-3.d, gas/sh/sh64/syntax-1.d,
gas/sh/sh64/syntax-2.d, gas/sh/sh64/ua32-1.d,
gas/sh/sh64/ua64-1.d: Likewise.

84 files changed, 150 insertions, 88 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 3cecec9..a980440 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,53 @@
+2002-10-09  Stephen Clarke <stephen.clarke@superh.com>
+
+	* gas/elf.exp: Don't run for sh64*-*-linux*, because it sets the
+	lsb in SHmedia code addresses.
+	* gas/sh/basic.exp: Force SHcompact for sh64*-*-linux* to enable
+	recognition of SH-1/2/3/4 instructions.
+	(proc do_fp): Do not run dsp tests for sh64*-*-linux*.
+	* gas/sh/sh64/abi-32.d: Adjust expected output to include
+	sh64*-*-linux* formats too.
+	* gas/sh/sh64/abi-64.d, gas/sh/sh64/basic-1.d,
+	gas/sh/sh64/case-1.d, gas/sh/sh64/case-noexp-1.d,
+	gas/sh/sh64/crange1-1.d, gas/sh/sh64/crange1-2.d,
+	gas/sh/sh64/crange2-1.d, gas/sh/sh64/crange2-2.d,
+	sh/sh64/crange2-noexp-1.d, gas/sh/sh64/crange3-1.d,
+	gas/sh/sh64/crange4-1.d, gas/sh/sh64/crange5-1.d,
+	gas/sh/sh64/creg-1.d, gas/sh/sh64/creg-2.d, gas/sh/sh64/datal-2.d,
+	gas/sh/sh64/datal32-1.d, gas/sh/sh64/datal32-3.d,
+	gas/sh/sh64/datal64-1.d, gas/sh/sh64/datal64-3.d,
+	gas/sh/sh64/endian-1.d, gas/sh/sh64/endian-2.d,
+	gas/sh/sh64/err-noexp-cmd1.s, gas/sh/sh64/immexpr32-1.d,
+	gas/sh/sh64/immexpr32-2.d, gas/sh/sh64/immexpr64-1.d,
+	gas/sh/sh64/immexpr64-2.d, gas/sh/sh64/lineno.d,
+	gas/sh/sh64/localcom-1.d, gas/sh/sh64/mix-1.d,
+	gas/sh/sh64/mix-noexp-1.d, gas/sh/sh64/movi-3.d,
+	gas/sh/sh64/movi32-1.d, gas/sh/sh64/movi32-2.d,
+	gas/sh/sh64/movi32-noexp-2.d, gas/sh/sh64/movi64-1.d,
+	gas/sh/sh64/movi64-2.d, gas/sh/sh64/movi64-3.d,
+	gas/sh/sh64/movi64-noexp-2.d, gas/sh/sh64/pt-1.d,
+	gas/sh/sh64/pt-noexp-1.d, gas/sh/sh64/pt32-1.d,
+	gas/sh/sh64/pt32-noexp-2.d, gas/sh/sh64/pt64-1.d,
+	gas/sh/sh64/pt64-32-1.d, gas/sh/sh64/pt64-32-2.d,
+	gas/sh/sh64/pt64-noexp-2.d, gas/sh/sh64/ptc32-1.d,
+	gas/sh/sh64/ptc32-noexp-1.d, gas/sh/sh64/ptc64-1.d,
+	gas/sh/sh64/ptc64-32-1.d, gas/sh/sh64/ptc64-noexp-1.d,
+	gas/sh/sh64/ptext32-1.d, gas/sh/sh64/ptext32-noexp-1.d,
+	gas/sh/sh64/ptext64-1.d, gas/sh/sh64/ptext64-32-1.d,
+	gas/sh/sh64/ptext64-noexp-1.d, gas/sh/sh64/rel32-1.d,
+	gas/sh/sh64/rel32-2.d, gas/sh/sh64/rel32-3.d,
+	gas/sh/sh64/rel32-4.d, gas/sh/sh64/rel32-5.d,
+	gas/sh/sh64/rel64-1.d, gas/sh/sh64/rel64-2.d,
+	gas/sh/sh64/rel64-3.d, gas/sh/sh64/rel64-4.d,
+	gas/sh/sh64/rel64-5.d, gas/sh/sh64/relax-1.d,
+	gas/sh/sh64/relax-2.d, gas/sh/sh64/relax-3.d,
+	gas/sh/sh64/shift32-1.d, gas/sh/sh64/shift32-3.d,
+	gas/sh/sh64/shift32-noexp-3.d, gas/sh/sh64/shift64-1.d,
+	gas/sh/sh64/shift64-2.d, gas/sh/sh64/shift64-3.d,
+	gas/sh/sh64/shift64-noexp-3.d, gas/sh/sh64/syntax-1.d,
+	gas/sh/sh64/syntax-2.d, gas/sh/sh64/ua32-1.d,
+	gas/sh/sh64/ua64-1.d: Likewise.
+	
 2002-10-03  Chris Demetriou  <cgd@broadcom.com>
 
 	* gas/mips/mips-no-jalx.l: Make error message regexps accomodate
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 610217c..0df76fe 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -37,6 +37,7 @@ if { ([istarget "*-*-elf*"]
      && ![istarget *-*-linux*aout*]
      && ![istarget *-*-linux*coff*]
      && ![istarget *-*-linux*oldld*]
+     && ![istarget sh64*-*-linux*]
 } then {
     set target_machine ""
     if {[istarget "mips*-*-*"]} then {
diff --git a/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp
index dade86a..e061974 100644
--- a/gas/testsuite/gas/sh/basic.exp
+++ b/gas/testsuite/gas/sh/basic.exp
@@ -23,6 +23,12 @@ if [istarget "sh*-*-linux-gnu"] {
     global ASFLAGS
     set ASFLAGS "$ASFLAGS -big"
 }
+if [istarget "sh64*-*-linux*"] {
+    global ASFLAGS
+
+    set old_ASFLAGS $ASFLAGS
+    set ASFLAGS "$ASFLAGS --abi=32 --isa=SHcompact"
+}
 
 proc do_fp {} {
     set testname "fp.s: floating point tests (sh3e)"
@@ -124,7 +130,7 @@ if [istarget sh*-*-*] then {
     # dumped as sh4.
     if {[istarget sh*-*coff] || [istarget sh*-pe*] || [istarget sh*-rtems]} then {
 	run_dump_test "pcrel-coff"
-    } else {
+    } elseif {![istarget sh64*-*-linux*]} {
 	# Test DSP instructions
 	run_dump_test "dsp"
 
@@ -137,3 +143,8 @@ if [istarget sh*-*-*] then {
 	run_dump_test "pic"
     }
 }
+
+if {[info exists old_ASFLAGS]} {
+    global ASFLAGS
+    set ASFLAGS $old_ASFLAGS
+}
diff --git a/gas/testsuite/gas/sh/sh64/abi-32.d b/gas/testsuite/gas/sh/sh64/abi-32.d
index d9814cb..b1cf4d9 100644
--- a/gas/testsuite/gas/sh/sh64/abi-32.d
+++ b/gas/testsuite/gas/sh/sh64/abi-32.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Assertion .abi 32.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 [0]+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/abi-64.d b/gas/testsuite/gas/sh/sh64/abi-64.d
index 03f1ba4..210e261 100644
--- a/gas/testsuite/gas/sh/sh64/abi-64.d
+++ b/gas/testsuite/gas/sh/sh64/abi-64.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Assertion .abi 64.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 [0]+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/basic-1.d b/gas/testsuite/gas/sh/sh64/basic-1.d
index 289ec9c..f534c99c 100644
--- a/gas/testsuite/gas/sh/sh64/basic-1.d
+++ b/gas/testsuite/gas/sh/sh64/basic-1.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Basic SHmedia instructions.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 [0]+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/case-1.d b/gas/testsuite/gas/sh/sh64/case-1.d
index 4692356..adf51cb 100644
--- a/gas/testsuite/gas/sh/sh64/case-1.d
+++ b/gas/testsuite/gas/sh/sh64/case-1.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Case-insensitive registers and opcodes.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/case-noexp-1.d b/gas/testsuite/gas/sh/sh64/case-noexp-1.d
index a2070ac..589dd9d 100644
--- a/gas/testsuite/gas/sh/sh64/case-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/case-noexp-1.d
@@ -3,7 +3,7 @@
 #source: case-1.s
 #name: Case-insensitive registers and opcodes with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/crange1-1.d b/gas/testsuite/gas/sh/sh64/crange1-1.d
index 3dcbceb..23c7f06 100644
--- a/gas/testsuite/gas/sh/sh64/crange1-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange1-1.d
@@ -3,7 +3,7 @@
 #source: crange1.s
 #name: .cranges descriptors.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.cranges\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/crange1-2.d b/gas/testsuite/gas/sh/sh64/crange1-2.d
index f4ae83b..bef541b 100644
--- a/gas/testsuite/gas/sh/sh64/crange1-2.d
+++ b/gas/testsuite/gas/sh/sh64/crange1-2.d
@@ -1,9 +1,9 @@
-#as: --abi=32 -shcompact-const-crange
+#as: --abi=32 --isa=SHcompact -shcompact-const-crange
 #objdump: -sr
 #source: crange1.s
 #name: .cranges descriptors including SHcompact constant pool
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.cranges\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/crange2-1.d b/gas/testsuite/gas/sh/sh64/crange2-1.d
index 8cfc0cc..c60d7e0 100644
--- a/gas/testsuite/gas/sh/sh64/crange2-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange2-1.d
@@ -3,7 +3,7 @@
 #source: crange2.s
 #name: PT to SHcompact
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/crange2-2.d b/gas/testsuite/gas/sh/sh64/crange2-2.d
index 0468e2d..ce5a03e 100644
--- a/gas/testsuite/gas/sh/sh64/crange2-2.d
+++ b/gas/testsuite/gas/sh/sh64/crange2-2.d
@@ -3,7 +3,7 @@
 #source: crange2.s
 #name: .cranges descriptors for SHcompact and SHmedia in .text.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.cranges\]:
 
diff --git a/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d b/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
index 01a5629..cad9f38 100644
--- a/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange2-noexp-1.d
@@ -3,7 +3,7 @@
 #source: crange2.s
 #name: PT to SHcompact with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/crange3-1.d b/gas/testsuite/gas/sh/sh64/crange3-1.d
index fab5860..1210d76 100644
--- a/gas/testsuite/gas/sh/sh64/crange3-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange3-1.d
@@ -3,7 +3,7 @@
 #source: crange3.s
 #name: .cranges descriptors, constant mix.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.cranges\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/crange4-1.d b/gas/testsuite/gas/sh/sh64/crange4-1.d
index b9c81c7..1472492 100644
--- a/gas/testsuite/gas/sh/sh64/crange4-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange4-1.d
@@ -3,7 +3,7 @@
 #source: crange4.s
 #name: .cranges descriptors with final variant.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.cranges\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/crange5-1.d b/gas/testsuite/gas/sh/sh64/crange5-1.d
index c665548..bccb592 100644
--- a/gas/testsuite/gas/sh/sh64/crange5-1.d
+++ b/gas/testsuite/gas/sh/sh64/crange5-1.d
@@ -3,7 +3,7 @@
 #source: crange5.s
 #name: Avoid zero length .cranges range descriptor at .align in code.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Contents of section \.text:
  0000 e8003a00 d4ff80f0 4455fc00 acf000e0  .*
diff --git a/gas/testsuite/gas/sh/sh64/creg-1.d b/gas/testsuite/gas/sh/sh64/creg-1.d
index d4e613d..52fce6f 100644
--- a/gas/testsuite/gas/sh/sh64/creg-1.d
+++ b/gas/testsuite/gas/sh/sh64/creg-1.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Predefined control register names.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/creg-2.d b/gas/testsuite/gas/sh/sh64/creg-2.d
index 4dda639..2de2735 100644
--- a/gas/testsuite/gas/sh/sh64/creg-2.d
+++ b/gas/testsuite/gas/sh/sh64/creg-2.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Predefined control register names specified in crN syntax.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/datal-2.d b/gas/testsuite/gas/sh/sh64/datal-2.d
index 05650ff..ec9794d 100644
--- a/gas/testsuite/gas/sh/sh64/datal-2.d
+++ b/gas/testsuite/gas/sh/sh64/datal-2.d
@@ -3,7 +3,7 @@
 #source: datal-2.s
 #name: DataLabel redundant local use, SHcompact
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/datal32-1.d b/gas/testsuite/gas/sh/sh64/datal32-1.d
index 48d9030..2a546c3 100644
--- a/gas/testsuite/gas/sh/sh64/datal32-1.d
+++ b/gas/testsuite/gas/sh/sh64/datal32-1.d
@@ -3,7 +3,7 @@
 #source: datal-1.s
 #name: DataLabel redundant local use, SHmedia 32-bit ABI
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/datal32-3.d b/gas/testsuite/gas/sh/sh64/datal32-3.d
index b249744..074db6d 100644
--- a/gas/testsuite/gas/sh/sh64/datal32-3.d
+++ b/gas/testsuite/gas/sh/sh64/datal32-3.d
@@ -7,7 +7,7 @@
 # check that STT_DATALABEL is set, but objdump doesn't do that at present,
 # and readelf isn't supported as a run_dump_test tool.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 .*
 architecture: sh5, flags 0x0+11:
 HAS_RELOC, HAS_SYMS
diff --git a/gas/testsuite/gas/sh/sh64/datal64-1.d b/gas/testsuite/gas/sh/sh64/datal64-1.d
index 7726b7a..247ba80 100644
--- a/gas/testsuite/gas/sh/sh64/datal64-1.d
+++ b/gas/testsuite/gas/sh/sh64/datal64-1.d
@@ -3,7 +3,7 @@
 #source: datal-1.s
 #name: DataLabel redundant local use, SHmedia 64-bit ABI
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET           TYPE              VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/datal64-3.d b/gas/testsuite/gas/sh/sh64/datal64-3.d
index b062986..3c07f43 100644
--- a/gas/testsuite/gas/sh/sh64/datal64-3.d
+++ b/gas/testsuite/gas/sh/sh64/datal64-3.d
@@ -7,7 +7,7 @@
 # check that STT_DATALABEL is set, but objdump doesn't do that at present,
 # and readelf isn't supported as a run_dump_test tool.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 .*
 architecture: sh5, flags 0x0+11:
 HAS_RELOC, HAS_SYMS
diff --git a/gas/testsuite/gas/sh/sh64/endian-1.d b/gas/testsuite/gas/sh/sh64/endian-1.d
index 921e5a5..cdc0c9c 100644
--- a/gas/testsuite/gas/sh/sh64/endian-1.d
+++ b/gas/testsuite/gas/sh/sh64/endian-1.d
@@ -1,8 +1,8 @@
-#as: --isa=shmedia --no-exp -little
+#as: --isa=shmedia --abi=64 --no-exp -little
 #objdump: -s
 #name: SH64 Little Endian
 
-.*:     file format elf64-sh64l
+.*:     file format elf64-sh64.*
 
 Contents of section .text:
  0000 00d048cc 78563412 34120000.*
diff --git a/gas/testsuite/gas/sh/sh64/endian-2.d b/gas/testsuite/gas/sh/sh64/endian-2.d
index f3d6e02..1fc1e19 100644
--- a/gas/testsuite/gas/sh/sh64/endian-2.d
+++ b/gas/testsuite/gas/sh/sh64/endian-2.d
@@ -1,8 +1,8 @@
-#as: --isa=shmedia --no-exp
+#as: --isa=shmedia --abi=64 --no-exp -big
 #objdump: -s
 #name: SH64 Big Endian
 
-.*:     file format elf64-sh64
+.*:     file format elf64-sh64.*
 
 Contents of section .text:
  0000 cc48d000 12345678 12340000.*
diff --git a/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s b/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
index 3e3dde7..20190c2 100644
--- a/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
+++ b/gas/testsuite/gas/sh/sh64/err-noexp-cmd1.s
@@ -3,7 +3,7 @@
 
 ! { dg-do assemble }
 ! { dg-options "-no-expand" }
-! { dg-error ".* only valid with SHcompact or SHmedia" "" { target sh64-*-* } 0 }
+! { dg-error ".* only valid with SHcompact or SHmedia" "" { target sh64-*-elf* } 0 }
 
 	.text
 start:
diff --git a/gas/testsuite/gas/sh/sh64/immexpr32-1.d b/gas/testsuite/gas/sh/sh64/immexpr32-1.d
index 7541630..f27b602 100644
--- a/gas/testsuite/gas/sh/sh64/immexpr32-1.d
+++ b/gas/testsuite/gas/sh/sh64/immexpr32-1.d
@@ -3,7 +3,7 @@
 #source: immexpr1.s
 #name: Immediate resolved operands, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/immexpr32-2.d b/gas/testsuite/gas/sh/sh64/immexpr32-2.d
index d306444..3073ae9 100644
--- a/gas/testsuite/gas/sh/sh64/immexpr32-2.d
+++ b/gas/testsuite/gas/sh/sh64/immexpr32-2.d
@@ -3,7 +3,7 @@
 #source: immexpr2.s
 #name: Resolved 64-bit operand, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Contents of section \.text:
  0000 6ff0fff0 6ff0fff0 6ff0fff0           .*
diff --git a/gas/testsuite/gas/sh/sh64/immexpr64-1.d b/gas/testsuite/gas/sh/sh64/immexpr64-1.d
index 6b2decb..118bf02 100644
--- a/gas/testsuite/gas/sh/sh64/immexpr64-1.d
+++ b/gas/testsuite/gas/sh/sh64/immexpr64-1.d
@@ -3,7 +3,7 @@
 #source: immexpr1.s
 #name: Immediate resolved operands, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/immexpr64-2.d b/gas/testsuite/gas/sh/sh64/immexpr64-2.d
index f782ce4..eff3faa 100644
--- a/gas/testsuite/gas/sh/sh64/immexpr64-2.d
+++ b/gas/testsuite/gas/sh/sh64/immexpr64-2.d
@@ -3,7 +3,7 @@
 #source: immexpr2.s
 #name: Resolved 64-bit operand, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Contents of section \.text:
  0000 6ff0fff0 6ff0fff0 6ff0fff0           .*
diff --git a/gas/testsuite/gas/sh/sh64/lineno.d b/gas/testsuite/gas/sh/sh64/lineno.d
index 99ac94c..f2bb155 100644
--- a/gas/testsuite/gas/sh/sh64/lineno.d
+++ b/gas/testsuite/gas/sh/sh64/lineno.d
@@ -3,7 +3,7 @@
 #source: lineno.s
 #name: Dwarf2 line numbers vs macro opcodes
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section .text:
 
diff --git a/gas/testsuite/gas/sh/sh64/localcom-1.d b/gas/testsuite/gas/sh/sh64/localcom-1.d
index 395938d..bd8bc93 100644
--- a/gas/testsuite/gas/sh/sh64/localcom-1.d
+++ b/gas/testsuite/gas/sh/sh64/localcom-1.d
@@ -3,7 +3,7 @@
 #source: localcom-1.s
 #name: Datalabel on local comm symbol and equated local comm symbol
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 SYMBOL TABLE:
 0+0 l    d  \.text	0+ 
diff --git a/gas/testsuite/gas/sh/sh64/mix-1.d b/gas/testsuite/gas/sh/sh64/mix-1.d
index 6d4493c..86c0cf3 100644
--- a/gas/testsuite/gas/sh/sh64/mix-1.d
+++ b/gas/testsuite/gas/sh/sh64/mix-1.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Mixed-ISA objects.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/mix-noexp-1.d b/gas/testsuite/gas/sh/sh64/mix-noexp-1.d
index 5596608..9759f66 100644
--- a/gas/testsuite/gas/sh/sh64/mix-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/mix-noexp-1.d
@@ -3,7 +3,7 @@
 #source: mix-1.s
 #name: Mixed-ISA objects with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi-3.d b/gas/testsuite/gas/sh/sh64/movi-3.d
index 4900ef1..2cd4a71 100644
--- a/gas/testsuite/gas/sh/sh64/movi-3.d
+++ b/gas/testsuite/gas/sh/sh64/movi-3.d
@@ -3,7 +3,7 @@
 #source: movi-3.s
 #name: Assembler PC-rel resolved negative MOVI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi32-1.d b/gas/testsuite/gas/sh/sh64/movi32-1.d
index f1674ec..df515c5 100644
--- a/gas/testsuite/gas/sh/sh64/movi32-1.d
+++ b/gas/testsuite/gas/sh/sh64/movi32-1.d
@@ -3,7 +3,7 @@
 #source: movi-1.s
 #name: MOVI expansion, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi32-2.d b/gas/testsuite/gas/sh/sh64/movi32-2.d
index eb1f22b..a539c23 100644
--- a/gas/testsuite/gas/sh/sh64/movi32-2.d
+++ b/gas/testsuite/gas/sh/sh64/movi32-2.d
@@ -3,7 +3,7 @@
 #source: movi-2.s
 #name: MOVI expansion of local symbols with relocs, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d b/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
index 2cab9fd..1771bca 100644
--- a/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
+++ b/gas/testsuite/gas/sh/sh64/movi32-noexp-2.d
@@ -3,7 +3,7 @@
 #source: movi-2.s
 #name: MOVI non-expansion of local symbols with relocs, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi64-1.d b/gas/testsuite/gas/sh/sh64/movi64-1.d
index 536b949..680b803 100644
--- a/gas/testsuite/gas/sh/sh64/movi64-1.d
+++ b/gas/testsuite/gas/sh/sh64/movi64-1.d
@@ -3,7 +3,7 @@
 #source: movi-1.s
 #name: MOVI expansion, 64-bit ABI, 32-bit subset.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi64-2.d b/gas/testsuite/gas/sh/sh64/movi64-2.d
index c1b7e1d..980abfa 100644
--- a/gas/testsuite/gas/sh/sh64/movi64-2.d
+++ b/gas/testsuite/gas/sh/sh64/movi64-2.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: MOVI expansion, 64-bit ABI, 64-bit subset.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi64-3.d b/gas/testsuite/gas/sh/sh64/movi64-3.d
index 4ba6ac3..94236ec 100644
--- a/gas/testsuite/gas/sh/sh64/movi64-3.d
+++ b/gas/testsuite/gas/sh/sh64/movi64-3.d
@@ -3,7 +3,7 @@
 #source: movi-2.s
 #name: MOVI expansion of local symbols with relocs, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d b/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
index 13a26f1..62fc24e 100644
--- a/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
+++ b/gas/testsuite/gas/sh/sh64/movi64-noexp-2.d
@@ -3,7 +3,7 @@
 #source: movi-2.s
 #name: MOVI non-expansion of local symbols with relocs, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/pt-1.d b/gas/testsuite/gas/sh/sh64/pt-1.d
index 96d83d3..1040f8b 100644
--- a/gas/testsuite/gas/sh/sh64/pt-1.d
+++ b/gas/testsuite/gas/sh/sh64/pt-1.d
@@ -2,7 +2,7 @@
 #objdump: -dr
 #name: Basic SHmedia PT and PTA instructions.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 [0]+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt-noexp-1.d b/gas/testsuite/gas/sh/sh64/pt-noexp-1.d
index 17db665..5050763 100644
--- a/gas/testsuite/gas/sh/sh64/pt-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/pt-noexp-1.d
@@ -3,7 +3,7 @@
 #source: pt-1.s
 #name: Basic SHmedia PT and PTA instructions with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 [0]+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt32-1.d b/gas/testsuite/gas/sh/sh64/pt32-1.d
index faa5123..f9610eb 100644
--- a/gas/testsuite/gas/sh/sh64/pt32-1.d
+++ b/gas/testsuite/gas/sh/sh64/pt32-1.d
@@ -3,7 +3,7 @@
 #source: pt-2.s
 #name: Inter-segment PT, 32-bit.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 0+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d b/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
index 201e467..54bf4c9 100644
--- a/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
+++ b/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d
@@ -3,7 +3,7 @@
 #source: pt-2.s
 #name: Inter-segment PT, 32-bit with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 0+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt64-1.d b/gas/testsuite/gas/sh/sh64/pt64-1.d
index 4cbc7cd..9303c4f 100644
--- a/gas/testsuite/gas/sh/sh64/pt64-1.d
+++ b/gas/testsuite/gas/sh/sh64/pt64-1.d
@@ -3,7 +3,7 @@
 #source: pt-2.s
 #name: Inter-segment PT, 64-bit.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 0+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt64-32-1.d b/gas/testsuite/gas/sh/sh64/pt64-32-1.d
index 13ff816..1094516 100644
--- a/gas/testsuite/gas/sh/sh64/pt64-32-1.d
+++ b/gas/testsuite/gas/sh/sh64/pt64-32-1.d
@@ -1,9 +1,9 @@
-#as: --isa=shmedia -expand-pt32
+#as: --isa=shmedia --abi=64 -expand-pt32
 #objdump: -dr
 #source: pt-1.s
 #name: Basic SHmedia PT and PTA instructions with -expand-pt32.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 [0]+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt64-32-2.d b/gas/testsuite/gas/sh/sh64/pt64-32-2.d
index 727dd2a..1aee7bf 100644
--- a/gas/testsuite/gas/sh/sh64/pt64-32-2.d
+++ b/gas/testsuite/gas/sh/sh64/pt64-32-2.d
@@ -3,7 +3,7 @@
 #source: pt-2.s
 #name: Inter-segment PT, 64-bit with -expand-pt32.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 0+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d b/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
index 5ed5ef2..7a8d1d5 100644
--- a/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
+++ b/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d
@@ -3,7 +3,7 @@
 #source: pt-2.s
 #name: Inter-segment PT, 64-bit with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 0+ <start>:
diff --git a/gas/testsuite/gas/sh/sh64/ptc32-1.d b/gas/testsuite/gas/sh/sh64/ptc32-1.d
index 481a504..579fadb 100644
--- a/gas/testsuite/gas/sh/sh64/ptc32-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptc32-1.d
@@ -3,7 +3,7 @@
 #source: ptc-1.s
 #name: PT constant, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
index f5a3ced..977277d 100644
--- a/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptc32-noexp-1.d
@@ -3,7 +3,7 @@
 #source: ptc-1.s
 #name: PT constant, 32-bit ABI with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptc64-1.d b/gas/testsuite/gas/sh/sh64/ptc64-1.d
index 06ff3de..0ba58cc 100644
--- a/gas/testsuite/gas/sh/sh64/ptc64-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptc64-1.d
@@ -3,7 +3,7 @@
 #source: ptc-1.s
 #name: PT constant, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptc64-32-1.d b/gas/testsuite/gas/sh/sh64/ptc64-32-1.d
index a11e89c..1337cd4 100644
--- a/gas/testsuite/gas/sh/sh64/ptc64-32-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptc64-32-1.d
@@ -3,7 +3,7 @@
 #source: ptc-1.s
 #name: PT constant, 64-bit ABI with -expand-pt32.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
index 0abd382..325e57c 100644
--- a/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptc64-noexp-1.d
@@ -3,7 +3,7 @@
 #source: ptc-1.s
 #name: PT constant, 64-bit ABI with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptext32-1.d b/gas/testsuite/gas/sh/sh64/ptext32-1.d
index 84adf6a..834e9cd 100644
--- a/gas/testsuite/gas/sh/sh64/ptext32-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptext32-1.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #name: PT, PTA, PTB expansion for external symbols, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
index be41d1c..a5dbdf4 100644
--- a/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptext32-noexp-1.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #name: PT, PTA, PTB non-expansion for external symbols, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptext64-1.d b/gas/testsuite/gas/sh/sh64/ptext64-1.d
index eeb062e..8b99d5d 100644
--- a/gas/testsuite/gas/sh/sh64/ptext64-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptext64-1.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #name: PT, PTA, PTB expansion for external symbols, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptext64-32-1.d b/gas/testsuite/gas/sh/sh64/ptext64-32-1.d
index 3644528..d4d17e2 100644
--- a/gas/testsuite/gas/sh/sh64/ptext64-32-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptext64-32-1.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #name: PT, PTA, PTB expansion for external symbols, 64-bit ABI with -expand-pt32.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d b/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
index 79f1419..8a8daab 100644
--- a/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
+++ b/gas/testsuite/gas/sh/sh64/ptext64-noexp-1.d
@@ -3,7 +3,7 @@
 #objdump: -dr
 #name: PT, PTA, PTB non-expansion for external symbols, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/rel32-1.d b/gas/testsuite/gas/sh/sh64/rel32-1.d
index dab15e6..68ecc22 100644
--- a/gas/testsuite/gas/sh/sh64/rel32-1.d
+++ b/gas/testsuite/gas/sh/sh64/rel32-1.d
@@ -3,7 +3,7 @@
 #source: rel-1.s
 #name: MOVI: PC-relative relocs, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel32-2.d b/gas/testsuite/gas/sh/sh64/rel32-2.d
index 14d63d4..5bafc68 100644
--- a/gas/testsuite/gas/sh/sh64/rel32-2.d
+++ b/gas/testsuite/gas/sh/sh64/rel32-2.d
@@ -3,7 +3,7 @@
 #source: rel-2.s
 #name: MOVI: PC+1-relative relocs, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel32-3.d b/gas/testsuite/gas/sh/sh64/rel32-3.d
index f739477..aba5683 100644
--- a/gas/testsuite/gas/sh/sh64/rel32-3.d
+++ b/gas/testsuite/gas/sh/sh64/rel32-3.d
@@ -3,7 +3,7 @@
 #source: rel-3.s
 #name: MOVI: PC-relative datalabel relocs, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel32-4.d b/gas/testsuite/gas/sh/sh64/rel32-4.d
index 4922012..496edb8 100644
--- a/gas/testsuite/gas/sh/sh64/rel32-4.d
+++ b/gas/testsuite/gas/sh/sh64/rel32-4.d
@@ -3,7 +3,7 @@
 #source: rel-4.s
 #name: MOVI: PC+1-relative datalabel relocs, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel32-5.d b/gas/testsuite/gas/sh/sh64/rel32-5.d
index c2339a6..b2bd838 100644
--- a/gas/testsuite/gas/sh/sh64/rel32-5.d
+++ b/gas/testsuite/gas/sh/sh64/rel32-5.d
@@ -3,7 +3,7 @@
 #source: rel-5.s
 #name: MOVI: PC-relative reloc within .text, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel64-1.d b/gas/testsuite/gas/sh/sh64/rel64-1.d
index 27bfd45..7e9b638 100644
--- a/gas/testsuite/gas/sh/sh64/rel64-1.d
+++ b/gas/testsuite/gas/sh/sh64/rel64-1.d
@@ -3,7 +3,7 @@
 #source: rel-1.s
 #name: MOVI: PC-relative relocs, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET           TYPE              VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel64-2.d b/gas/testsuite/gas/sh/sh64/rel64-2.d
index cbd7457..eaecfbb 100644
--- a/gas/testsuite/gas/sh/sh64/rel64-2.d
+++ b/gas/testsuite/gas/sh/sh64/rel64-2.d
@@ -3,7 +3,7 @@
 #source: rel-2.s
 #name: MOVI: PC+1-relative relocs, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET           TYPE              VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel64-3.d b/gas/testsuite/gas/sh/sh64/rel64-3.d
index 2d1cfc0..986054d 100644
--- a/gas/testsuite/gas/sh/sh64/rel64-3.d
+++ b/gas/testsuite/gas/sh/sh64/rel64-3.d
@@ -3,7 +3,7 @@
 #source: rel-3.s
 #name: MOVI: PC-relative datalabel relocs, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET           TYPE              VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel64-4.d b/gas/testsuite/gas/sh/sh64/rel64-4.d
index cc95cd9..6ee35b7 100644
--- a/gas/testsuite/gas/sh/sh64/rel64-4.d
+++ b/gas/testsuite/gas/sh/sh64/rel64-4.d
@@ -3,7 +3,7 @@
 #source: rel-4.s
 #name: MOVI: PC+1-relative datalabel relocs, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET           TYPE              VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/rel64-5.d b/gas/testsuite/gas/sh/sh64/rel64-5.d
index db41915..63b04bb 100644
--- a/gas/testsuite/gas/sh/sh64/rel64-5.d
+++ b/gas/testsuite/gas/sh/sh64/rel64-5.d
@@ -3,7 +3,7 @@
 #source: rel-5.s
 #name: MOVI: PC-relative reloc within .text, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.text\]:
 OFFSET           TYPE              VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/relax-1.d b/gas/testsuite/gas/sh/sh64/relax-1.d
index 97cdd68..82fb4c6 100644
--- a/gas/testsuite/gas/sh/sh64/relax-1.d
+++ b/gas/testsuite/gas/sh/sh64/relax-1.d
@@ -3,7 +3,7 @@
 #source: relax-1.s
 #name: Assembler PT relaxation limit, from first to second state.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/relax-2.d b/gas/testsuite/gas/sh/sh64/relax-2.d
index 4280f44..c954dd4 100644
--- a/gas/testsuite/gas/sh/sh64/relax-2.d
+++ b/gas/testsuite/gas/sh/sh64/relax-2.d
@@ -3,7 +3,7 @@
 #source: relax-2.s
 #name: Assembler PTB relaxation limit, from first to second state.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/relax-3.d b/gas/testsuite/gas/sh/sh64/relax-3.d
index b0a93b2..80dd1ae 100644
--- a/gas/testsuite/gas/sh/sh64/relax-3.d
+++ b/gas/testsuite/gas/sh/sh64/relax-3.d
@@ -3,7 +3,7 @@
 #source: relax-3.s
 #name: Assembler PC-rel MOVI relaxation limit, from first to second state.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift32-1.d b/gas/testsuite/gas/sh/sh64/shift32-1.d
index 8e1d428..7e14c21 100644
--- a/gas/testsuite/gas/sh/sh64/shift32-1.d
+++ b/gas/testsuite/gas/sh/sh64/shift32-1.d
@@ -3,7 +3,7 @@
 #source: shift-1.s
 #name: Shift expressions, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift32-3.d b/gas/testsuite/gas/sh/sh64/shift32-3.d
index e952705..01a0c53 100644
--- a/gas/testsuite/gas/sh/sh64/shift32-3.d
+++ b/gas/testsuite/gas/sh/sh64/shift32-3.d
@@ -3,7 +3,7 @@
 #source: shift-3.s
 #name: Shift expression, local but undefined symbol, 32-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d b/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
index 0a965f1..3d8c34b 100644
--- a/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
+++ b/gas/testsuite/gas/sh/sh64/shift32-noexp-3.d
@@ -3,7 +3,7 @@
 #source: shift-3.s
 #name: Shift expression, local but undefined symbol, 32-bit ABI with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift64-1.d b/gas/testsuite/gas/sh/sh64/shift64-1.d
index 2d85ac0..a19ed35 100644
--- a/gas/testsuite/gas/sh/sh64/shift64-1.d
+++ b/gas/testsuite/gas/sh/sh64/shift64-1.d
@@ -3,7 +3,7 @@
 #source: shift-1.s
 #name: Shift expressions, 64-bit ABI, 32-bit subset.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift64-2.d b/gas/testsuite/gas/sh/sh64/shift64-2.d
index 65fdedc..51528c2 100644
--- a/gas/testsuite/gas/sh/sh64/shift64-2.d
+++ b/gas/testsuite/gas/sh/sh64/shift64-2.d
@@ -3,7 +3,7 @@
 #source: shift-2.s
 #name: Shift expressions, 64-bit ABI, 64-bit subset.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift64-3.d b/gas/testsuite/gas/sh/sh64/shift64-3.d
index c7df151..8d3d950 100644
--- a/gas/testsuite/gas/sh/sh64/shift64-3.d
+++ b/gas/testsuite/gas/sh/sh64/shift64-3.d
@@ -3,7 +3,7 @@
 #source: shift-3.s
 #name: Shift expression, local but undefined symbol, 64-bit ABI.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d b/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
index 5addd56..70ec8c5 100644
--- a/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
+++ b/gas/testsuite/gas/sh/sh64/shift64-noexp-3.d
@@ -3,7 +3,7 @@
 #source: shift-3.s
 #name: Shift expression, local but undefined symbol, 64-bit ABI with -no-expand.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/sh/sh64/syntax-1.d b/gas/testsuite/gas/sh/sh64/syntax-1.d
index 1134819..84a9c25 100644
--- a/gas/testsuite/gas/sh/sh64/syntax-1.d
+++ b/gas/testsuite/gas/sh/sh64/syntax-1.d
@@ -1,8 +1,8 @@
-#as: --isa=shmedia --no-exp
+#as: --isa=shmedia --abi=64 --no-exp
 #objdump: -d
 #name: Minimum SH64 Syntax Support.
 
-.*:     file format elf64-sh64
+.*:     file format elf64-sh64.*
 
 Disassembly of section .text:
 
diff --git a/gas/testsuite/gas/sh/sh64/syntax-2.d b/gas/testsuite/gas/sh/sh64/syntax-2.d
index 9c57087..da90e5e 100644
--- a/gas/testsuite/gas/sh/sh64/syntax-2.d
+++ b/gas/testsuite/gas/sh/sh64/syntax-2.d
@@ -1,8 +1,8 @@
-#as: --isa=shmedia
+#as: --isa=shmedia --abi=64
 #objdump: -d
 #name: Minimum SH64 Syntax Support - Pseudos.
 
-dump.o:     file format elf64-sh64
+dump.o:     file format elf64-sh64.*
 
 Disassembly of section .text:
 
diff --git a/gas/testsuite/gas/sh/sh64/ua32-1.d b/gas/testsuite/gas/sh/sh64/ua32-1.d
index 9e7f8d4..79b4ccf 100644
--- a/gas/testsuite/gas/sh/sh64/ua32-1.d
+++ b/gas/testsuite/gas/sh/sh64/ua32-1.d
@@ -6,7 +6,7 @@
 # Note that the relocs for externsym0 + 3 and externsym2 + 42 are
 # partial-in-place, i.e. REL-like, and are not displayed correctly.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.rodata\]:
 OFFSET  *TYPE  *VALUE 
diff --git a/gas/testsuite/gas/sh/sh64/ua64-1.d b/gas/testsuite/gas/sh/sh64/ua64-1.d
index a977f15..8ba6287 100644
--- a/gas/testsuite/gas/sh/sh64/ua64-1.d
+++ b/gas/testsuite/gas/sh/sh64/ua64-1.d
@@ -6,7 +6,7 @@
 # Note that the relocs for externsym0 + 3 and externsym2 + 42 are
 # partial-in-place, i.e. REL-like, and are not displayed correctly.
 
-.*:     file format .*-sh64
+.*:     file format .*-sh64.*
 
 RELOCATION RECORDS FOR \[\.rodata\]:
 OFFSET           TYPE              VALUE