* 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.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 3cecec9faebfd64b65501fd08da6ba03a424c0aa..a9804404f5a3bc0ad50ef5888d0d9102d0962cb7 100644 (file)
--- 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 610217c4c8934c13991f445411c2d95059bbeb56..0df76fe6af9d444da00d6c914c03b99f8123df47 100644 (file)
--- 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 dade86aca2fcc9cfee7ce28b1b23d8ba10fea10b..e0619746d845dfb98fe95aea1e6f9cb454d64476 100644 (file)
--- 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 d9814cb498d348fa09ff0ce9e4debb3d589dbd06..b1cf4d91dd29e105c99eabd39f36cd566b3aa3a0 100644 (file)
--- 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 03f1ba4af7a5f5c3de96abd5d0ee79d2db92ff54..210e26168f806b5e476754d8b9237625b924d1f5 100644 (file)
--- 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 289ec9cba61b1035fdcede040b8f174cad349918..f534c99c7d0ebfd04d656542ad4c5a0a49f06336 100644 (file)
--- 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 46923565e9a6c9aa2742f50f36db25fe3ad50110..adf51cb96ee0046dd86eef82f3a573b83eb7dba1 100644 (file)
--- 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 a2070ac42f61997b699908f04b3e829e5967657a..589dd9d5ce6515a99fbb66eff3b5eb6475542874 100644 (file)
--- 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 3dcbcebc374c15f9e530f97189035b30289ee377..23c7f06d7a251a9392a42dd24f6559a79d8db6dc 100644 (file)
--- 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 f4ae83bba447e2ed55e2c281ddb20339bf8fdad8..bef541ba82cbdd10e9230c1a78b9d1cee6873994 100644 (file)
--- 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 8cfc0cc7c08adbd7220005d3c3ecc2525e1add49..c60d7e08c3c5c59959a3bdea0b91d414cf8dcb3a 100644 (file)
--- 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 0468e2d4d3079ec3a216d857e7a42ec29874e73d..ce5a03e8b13ab8706f6d76e6ffe1ec64a523fc41 100644 (file)
--- 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 01a5629fb604c8484ea4c6c08498d637ef895140..cad9f3886beaac8f87ea504b6741e1b3ec2ec189 100644 (file)
--- 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 fab5860d4239c01c174e7016970b3c1e2d6256f0..1210d76ecb30bcd4d5ff9b676faf15294a20cbc1 100644 (file)
--- 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 b9c81c7548a686cd270ec67e5b7a9a1ce3c8330a..1472492542a73d4524a6bf4090abc0f7a26776bb 100644 (file)
--- 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 c665548b32de5ccc684625c9b20d65371ce1e4eb..bccb5923ee09c632a9241d7585eea6eb0cd988d6 100644 (file)
--- 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 d4e613d5f30f25a21133481722ea7d0658933988..52fce6ff5284944e002070cdd73473488cd3bb17 100644 (file)
--- 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 4dda63992c607f51996ae53157c793dde5a6e5d9..2de27350fa463feafaea9a140c1d27628b2b005c 100644 (file)
--- 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 05650ffe4d6110fe4cfb2fae76caaa6ddb2ecfbf..ec9794dc94698242ec20726785ce29d819a4b485 100644 (file)
--- 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 48d9030f8288f1ba8e0f784cee1cb23434f3f71a..2a546c395a1bc36e9b5a7ddb22dde76a188056b1 100644 (file)
--- 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 b24974477c7b74f7472174860dddbb3cc07b7271..074db6d46363372b180c7f7bb4b8c32e454b07fc 100644 (file)
--- 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 7726b7a4f0868ad3b02bfabb4a86f94b4577fc82..247ba806f808cb0a3007851291c86315e4b530f6 100644 (file)
--- 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 b0629866cb7d08d7b67cffd4c17016d7378b7eba..3c07f433a2a716fe6d1be0dba5ebfbd1db251150 100644 (file)
--- 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 921e5a5e2eb65788b8013af1460d501a39e15fb4..cdc0c9cc21ac6067ca4c8f359cb495d14a2a750e 100644 (file)
--- 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 f3d6e0267c4f670645573df3ab22a18ac5b40346..1fc1e19b67ef3421d778c26bf7d9c78d80c69b99 100644 (file)
--- 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 3e3dde7a159006a9dc0ffc95189b66b2a15499d4..20190c2110c216f86a717d6fadd7c720f70646f0 100644 (file)
--- 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 75416302f1daa306c59a76b4d076b987059a4ed6..f27b602dc095e0315a85f139a23ffae647ce6e52 100644 (file)
--- 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 d3064446a988cdde3c3e23bd7ab8710a15689bd1..3073ae9c8f4ad5f6fa30389526f6785586490cb2 100644 (file)
--- 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 6b2decbb25041e69c40db7c43e5d0f524d271574..118bf021f057d01d0e908bf25a56dc49f86c02e2 100644 (file)
--- 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 f782ce4f5de7c2a01800fba578e66d46cc2072b4..eff3faaa1106bd8b2e82eae712fa27c97fb67cb4 100644 (file)
--- 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 99ac94c2afa04e5f260d74b34ef34769a58db1ec..f2bb1559641cd9bc429da3c19046cb785d06c3ca 100644 (file)
--- 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 395938d0a9da64a8d4b3674b5e197384625ceb96..bd8bc93dc1dba0c3ec33bc11d007ec6c5eeacd1f 100644 (file)
--- 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 6d4493cf46ea9ba1a5aa7f628e017d73d4b81258..86c0cf38425f105b949f3ed93cb49b126784869e 100644 (file)
--- 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 5596608c18a8a273f6be852fed48e775fbd489dd..9759f6652721fb39411c166d4e2009fb05e1263e 100644 (file)
--- 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 4900ef11615a1e4c672eeace6aea9d3941c2b4e3..2cd4a710f366fd778846fffdd5e9652c1d3cd0cb 100644 (file)
--- 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 f1674ecd2b9ff67dda149d486778d1bb11641e48..df515c59f7e793977fd4afb000a9fa40c098d7f2 100644 (file)
--- 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 eb1f22b17163a021d887e50a5bb1c7991b3e2e79..a539c234db853f4a548d05dbd79b9ac6d7f179bc 100644 (file)
--- 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 2cab9fd525f4fb60eaa09cb8c9d252c00adf4c21..1771bca5cc0d2fd99183b860641b4fa72b385fa0 100644 (file)
--- 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 536b949eec4feca11b1fad09be62acc011294f40..680b803e75ac1419e99a3199b85532527a0a756e 100644 (file)
--- 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 c1b7e1d64d0ab5e534c69f35f1782b401418ec20..980abfa8c2e0255cc141de82a6ea1cb53c6292c9 100644 (file)
--- 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 4ba6ac34a61d261073a0417f6fdf7427b6b3883f..94236ec0a8fe11ef476c6cba05ad962ef3cdde1f 100644 (file)
--- 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 13a26f171130477f7c79768956e46f5639a64d84..62fc24efca22e78bac31aeecbea175f853f8617d 100644 (file)
--- 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 96d83d39d669c0ce851d0ad4633925efc16378ab..1040f8be8efe8e7a2133c8fc97561c75a5cff0d7 100644 (file)
--- 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 17db665d9733395e4b81dd8ed3345f21c1053d11..505076384bc9110f1b79260601692483af709bff 100644 (file)
--- 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 faa5123054062f2e9d00e760f91061f95559a69e..f9610eba3752e28af466f0d2cab20a3ec34798b0 100644 (file)
--- 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 201e467229655fe8e27187d8ff651eed0d2493f5..54bf4c965e80948eb023f7716de5172438a7e961 100644 (file)
--- 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 4cbc7cd56141a354b26e06743396765bdb47fec5..9303c4f3719b090e65a54fb188c0dc88fb2d514c 100644 (file)
--- 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 13ff8168907157104f3c2869e7812dc065fc2f1f..109451656deb2e27434ff1900030b59755aa6be2 100644 (file)
--- 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 727dd2a38248ef316af6813060c39e9386cc1cac..1aee7bfa77f854be8565b659c2bd94332280973a 100644 (file)
--- 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 5ed5ef226e673c0bb1adad69e233e58daaed5753..7a8d1d577096d811d68501c0f4dc0e862fc5a47e 100644 (file)
--- 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 481a504cc39dfc92826f5054aba5d69e7e3dcf90..579fadbab8479fd34e3629e68bb52533aeeb848b 100644 (file)
--- 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 f5a3ced77aeb3b2418c91bb8489fb4265ccd9e22..977277d18476f50f0fce203315f9361a5523867f 100644 (file)
--- 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 06ff3de43087cffdb1a37af943825691e52af8d1..0ba58cc36e893ec47a3114b31cbe41b9abc9cbcd 100644 (file)
--- 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 a11e89ca02a02646e638de423df9e8b6489a4597..1337cd4297afd96f0d4e608d01791f286960648a 100644 (file)
--- 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 0abd382a16f133613170fee84e3dbf345f289b8f..325e57ce60310958cc7cf7ed42ee699c938331b2 100644 (file)
--- 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 84adf6ad715fd649cc79fa32e6dac9b22c1414db..834e9cd9c0c5593d9480edfc8a97b90967e18f8b 100644 (file)
--- 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 be41d1cf35d7cc5a26928fdb65d4352b9832e576..a5dbdf4d7bcd22933d8c8b33e3a382699b7a7d6d 100644 (file)
--- 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 eeb062e70e582c0c926dbd6ce2c6c49f49956d8f..8b99d5d2dad64051ca4c5fc5572e517dd76bb22b 100644 (file)
--- 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 3644528eb13225a89761dd28d6da309257c42c69..d4d17e2956af72d6d333a992486535bb01d1cb99 100644 (file)
--- 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 79f141922e8e4248059e6e0e0b1aaef85b5059a3..8a8daab81d7733d9be0bc9d145bd802a0cd05356 100644 (file)
--- 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 dab15e69ed9073dd79566d44523b61d1b247c37d..68ecc22d727001a3218e63bc6f4204568d999bc8 100644 (file)
--- 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 14d63d42965472a114ec7dfa70a147c359abef6d..5bafc687ccee6e54dd4e3af3e853a91494a53778 100644 (file)
--- 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 f73947799acef8f3d35d472d9c0de5907874ab94..aba56837b3b41058e807a9f71b18985f7943f27c 100644 (file)
--- 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 49220122c79069702e7105a0f2971cd6f22583ac..496edb802f811078a38bbfef481affee942677d7 100644 (file)
--- 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 c2339a6b32fbbb666ea144a66e0f24a1b8e5f974..b2bd838e5a72fd52aa0ac1b68499040663518d0c 100644 (file)
--- 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 27bfd45244fd74a1aeee1537cc66572985007347..7e9b63833c0687cf71effd921aedd282d30e4a03 100644 (file)
--- 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 cbd74576f7f5b596e0da7630afa41090f81b8125..eaecfbb1c23d3c3df82d28c4193b043d803c702f 100644 (file)
--- 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 2d1cfc0b762f20cc26687a9f118df9bedf540311..986054d4b413f761033438d51efff41986fc3503 100644 (file)
--- 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 cc95cd92c8de26b496114faf94bad4239463ce52..6ee35b76984650e4cd8260551aa599cfb2c96e96 100644 (file)
--- 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 db419157f58bb460ea6d11c7002eb47fa45d5615..63b04bb80653cae1cd07d7209043d5842372fd54 100644 (file)
--- 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 97cdd68eb0b903b5d440f4675f449f2b882da345..82fb4c6f272e87bc0a1cf98a82c7a07077fe02a4 100644 (file)
--- 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 4280f44e5492fe129c0cead0d104c75dce580517..c954dd465afa48e60d3ac18e960ea3a44afa965b 100644 (file)
--- 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 b0a93b2c3f9405a0dd911aaefe505beeec84b51c..80dd1aea7794972ba7cc4435e80e9b6ad2ebb3c1 100644 (file)
--- 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 8e1d4287a9f685a5adbb539bbaee434611f0bddc..7e14c21d29e820e08f7a3a24ebe2eddd00512b3f 100644 (file)
--- 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 e952705aad292fc2f026adfcb5c69bc5eef40d3c..01a0c531d91621ec53f18c335bd4b4a470b71142 100644 (file)
--- 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 0a965f16a688c00f6a186a1f5c819080afa927fd..3d8c34b3052e7758d3153010652bf86809fcaa79 100644 (file)
--- 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 2d85ac09aaebeb212ff37ecc5e876090a914575c..a19ed3578e3f944f31273693639a4a223d9ad01f 100644 (file)
--- 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 65fdedc640370e71520f44ff69747a558ed7fb44..51528c2c7250bb97f45f518a2256351bb6d77826 100644 (file)
--- 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 c7df151486c00706be3370e324b99a4259a323dc..8d3d95062622d108525ce5a75abca35c2f67d8c5 100644 (file)
--- 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 5addd56d822298363cfc6a2fe64b2de699f4cac8..70ec8c5cacd8ccfb22150f9e471ce22401803121 100644 (file)
--- 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 113481904718dcbcca3c2787a79d93e535e4b7f8..84a9c25521028444a419ced0b283799cd328734f 100644 (file)
--- 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 9c57087148eb957c9202b6a5fa8a4de543f4fe23..da90e5ec986ec6d2abf765a15db8f127d31b520d 100644 (file)
--- 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 9e7f8d4cae1055679bb39df3b2841232eac20378..79b4ccf22293081c2e3f1e41b050c2277137cbc1 100644 (file)
--- 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 a977f15b9f04aec08d6909ebb4da9b23be4b96a0..8ba628706086cd24dc561ea8ae352874b9d533e8 100644 (file)
--- 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