From: Stephen Clarke Date: Wed, 9 Oct 2002 19:40:42 +0000 (+0000) Subject: * gas/elf.exp: Don't run for sh64*-*-linux*, because it sets the X-Git-Tag: jimb-dwarf-compression-021023-branchpoint~169 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42bf09b2b1f3991d227fa4f776082018cb4738d5;p=thirdparty%2Fbinutils-gdb.git * 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 3cecec9faeb..a9804404f5a 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,53 @@ +2002-10-09 Stephen Clarke + + * 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 * 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 610217c4c89..0df76fe6af9 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 dade86aca2f..e0619746d84 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 d9814cb498d..b1cf4d91dd2 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]+ : diff --git a/gas/testsuite/gas/sh/sh64/abi-64.d b/gas/testsuite/gas/sh/sh64/abi-64.d index 03f1ba4af7a..210e26168f8 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]+ : diff --git a/gas/testsuite/gas/sh/sh64/basic-1.d b/gas/testsuite/gas/sh/sh64/basic-1.d index 289ec9cba61..f534c99c7d0 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]+ : diff --git a/gas/testsuite/gas/sh/sh64/case-1.d b/gas/testsuite/gas/sh/sh64/case-1.d index 46923565e9a..adf51cb96ee 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 a2070ac42f6..589dd9d5ce6 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 3dcbcebc374..23c7f06d7a2 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 f4ae83bba44..bef541ba82c 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 8cfc0cc7c08..c60d7e08c3c 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 0468e2d4d30..ce5a03e8b13 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 01a5629fb60..cad9f3886be 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 fab5860d423..1210d76ecb3 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 b9c81c7548a..1472492542a 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 c665548b32d..bccb5923ee0 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 d4e613d5f30..52fce6ff528 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 4dda63992c6..2de27350fa4 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 05650ffe4d6..ec9794dc946 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 48d9030f828..2a546c395a1 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 b24974477c7..074db6d4636 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 7726b7a4f08..247ba806f80 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 b0629866cb7..3c07f433a2a 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 921e5a5e2eb..cdc0c9cc21a 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 f3d6e0267c4..1fc1e19b67e 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 3e3dde7a159..20190c2110c 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 75416302f1d..f27b602dc09 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 d3064446a98..3073ae9c8f4 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 6b2decbb250..118bf021f05 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 f782ce4f5de..eff3faaa110 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 99ac94c2afa..f2bb1559641 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 395938d0a9d..bd8bc93dc1d 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 6d4493cf46e..86c0cf38425 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 5596608c18a..9759f665272 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 4900ef11615..2cd4a710f36 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 f1674ecd2b9..df515c59f7e 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 eb1f22b1716..a539c234db8 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 2cab9fd525f..1771bca5cc0 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 536b949eec4..680b803e75a 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 c1b7e1d64d0..980abfa8c2e 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 4ba6ac34a61..94236ec0a8f 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 13a26f17113..62fc24efca2 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 96d83d39d66..1040f8be8ef 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]+ : diff --git a/gas/testsuite/gas/sh/sh64/pt-noexp-1.d b/gas/testsuite/gas/sh/sh64/pt-noexp-1.d index 17db665d973..505076384bc 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]+ : diff --git a/gas/testsuite/gas/sh/sh64/pt32-1.d b/gas/testsuite/gas/sh/sh64/pt32-1.d index faa51230540..f9610eba375 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+ : diff --git a/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d b/gas/testsuite/gas/sh/sh64/pt32-noexp-2.d index 201e4672296..54bf4c965e8 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+ : diff --git a/gas/testsuite/gas/sh/sh64/pt64-1.d b/gas/testsuite/gas/sh/sh64/pt64-1.d index 4cbc7cd5614..9303c4f3719 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+ : diff --git a/gas/testsuite/gas/sh/sh64/pt64-32-1.d b/gas/testsuite/gas/sh/sh64/pt64-32-1.d index 13ff8168907..109451656de 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]+ : diff --git a/gas/testsuite/gas/sh/sh64/pt64-32-2.d b/gas/testsuite/gas/sh/sh64/pt64-32-2.d index 727dd2a3824..1aee7bfa77f 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+ : diff --git a/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d b/gas/testsuite/gas/sh/sh64/pt64-noexp-2.d index 5ed5ef226e6..7a8d1d57709 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+ : diff --git a/gas/testsuite/gas/sh/sh64/ptc32-1.d b/gas/testsuite/gas/sh/sh64/ptc32-1.d index 481a504cc39..579fadbab84 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 f5a3ced77ae..977277d1847 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 06ff3de4308..0ba58cc36e8 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 a11e89ca02a..1337cd4297a 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 0abd382a16f..325e57ce603 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 84adf6ad715..834e9cd9c0c 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 be41d1cf35d..a5dbdf4d7bc 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 eeb062e70e5..8b99d5d2dad 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 3644528eb13..d4d17e2956a 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 79f141922e8..8a8daab81d7 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 dab15e69ed9..68ecc22d727 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 14d63d42965..5bafc687cce 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 f73947799ac..aba56837b3b 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 49220122c79..496edb802f8 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 c2339a6b32f..b2bd838e5a7 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 27bfd45244f..7e9b63833c0 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 cbd74576f7f..eaecfbb1c23 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 2d1cfc0b762..986054d4b41 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 cc95cd92c8d..6ee35b76984 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 db419157f58..63b04bb8065 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 97cdd68eb0b..82fb4c6f272 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 4280f44e549..c954dd465af 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 b0a93b2c3f9..80dd1aea779 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 8e1d4287a9f..7e14c21d29e 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 e952705aad2..01a0c531d91 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 0a965f16a68..3d8c34b3052 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 2d85ac09aae..a19ed3578e3 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 65fdedc6403..51528c2c725 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 c7df151486c..8d3d9506262 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 5addd56d822..70ec8c5cacd 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 11348190471..84a9c255210 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 9c57087148e..da90e5ec986 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 9e7f8d4cae1..79b4ccf2229 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 a977f15b9f0..8ba62870608 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