From 8bda49467034dd9dfd0cd773ed1b9a07281b83e8 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 16 Aug 2002 00:06:06 +0000 Subject: [PATCH] * gas/all/gas.exp (forward references): Don't test c30. * gas/d30v/guard-debug.d: Use -gstabs rather than -g. * gas/elf/ehopt0.s: Don't use "$" in labels. * gas/ieee-fp/x930509a.exp: Don't test c30. * gas/m68hc11/malis.d: Adjust -I so that test runs when not building in source dir. * gas/mri/mri.exp: Don't run on "m68hc*". * gas/sh/basic.exp (do_fp): Match LE too. (pcrel-coff): Run this version for "sh*-pe*" and rename "sh*-hms" to "sh*-rtems". * gas/sh/pcrel-coff.d: Add -EB to objdump flags. * gas/vtable/vtable.exp: Don't run on linuxecoff. setup_xfail in preference to not running on ELF targets that might one day pass. Add more xfails. Add more targets to the REL list. --- gas/testsuite/ChangeLog | 17 ++++++++++ gas/testsuite/gas/all/gas.exp | 9 +++--- gas/testsuite/gas/d30v/guard-debug.d | 2 +- gas/testsuite/gas/elf/ehopt0.s | 30 ++++++++--------- gas/testsuite/gas/ieee-fp/x930509a.exp | 2 +- gas/testsuite/gas/m68hc11/malis.d | 2 +- gas/testsuite/gas/mri/mri.exp | 2 +- gas/testsuite/gas/sh/basic.exp | 33 ++++++++++++++++++- gas/testsuite/gas/sh/pcrel-coff.d | 2 +- gas/testsuite/gas/vtable/vtable.exp | 45 +++++++++++++------------- 10 files changed, 96 insertions(+), 48 deletions(-) diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 1856f1f0ad..b845919c2c 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,20 @@ +2002-08-16 Alan Modra + + * gas/all/gas.exp (forward references): Don't test c30. + * gas/d30v/guard-debug.d: Use -gstabs rather than -g. + * gas/elf/ehopt0.s: Don't use "$" in labels. + * gas/ieee-fp/x930509a.exp: Don't test c30. + * gas/m68hc11/malis.d: Adjust -I so that test runs when not building + in source dir. + * gas/mri/mri.exp: Don't run on "m68hc*". + * gas/sh/basic.exp (do_fp): Match LE too. + (pcrel-coff): Run this version for "sh*-pe*" and rename "sh*-hms" to + "sh*-rtems". + * gas/sh/pcrel-coff.d: Add -EB to objdump flags. + * gas/vtable/vtable.exp: Don't run on linuxecoff. setup_xfail in + preference to not running on ELF targets that might one day pass. + Add more xfails. Add more targets to the REL list. + 2002-08-14 H.J. Lu * gas/mips/elempic.d: Treat "addiu" and "daddiu" as equivalent diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp index 8720665a6a..a57bd520eb 100644 --- a/gas/testsuite/gas/all/gas.exp +++ b/gas/testsuite/gas/all/gas.exp @@ -89,13 +89,12 @@ proc do_930509a {} { # must not be resolved by the assembler. # C54x assembler (for compatibility) does not allow differences between # forward references -if { ![istarget hppa*-*-*] && ![istarget *c54x*-*-*] } then { +# C30 counts a four byte offset as a difference of one. +if { ![istarget hppa*-*-*] + && ![istarget *c30*-*-*] && ![istarget *c54x*-*-*] } then { # the vax fails because VMS can apparently actually handle this # case in relocs, so gas doesn't handle it itself. - setup_xfail "vax*-*-vms*" - setup_xfail "mn10300*-*-*" - setup_xfail "mn10200*-*-*" - setup_xfail "h8300*-*-elf*" + setup_xfail "h8300*-*-elf*" "mn10200*-*-*" "mn10300*-*-*" "vax*-*-vms*" do_930509a } diff --git a/gas/testsuite/gas/d30v/guard-debug.d b/gas/testsuite/gas/d30v/guard-debug.d index e9a154c851..6dd649c1fc 100644 --- a/gas/testsuite/gas/d30v/guard-debug.d +++ b/gas/testsuite/gas/d30v/guard-debug.d @@ -1,6 +1,6 @@ #objdump: -ldr #name: D30V debug (-g) test -#as: -g +#as: -gstabs .*: +file format elf32-d30v diff --git a/gas/testsuite/gas/elf/ehopt0.s b/gas/testsuite/gas/elf/ehopt0.s index ae56f6d609..1029943ad7 100644 --- a/gas/testsuite/gas/elf/ehopt0.s +++ b/gas/testsuite/gas/elf/ehopt0.s @@ -1,13 +1,13 @@ .text -$LFB1: +LFB1: .4byte 0 -$L1: +L1: .4byte 0 -$LFE1: +LFE1: .section .eh_frame,"aw" __FRAME_BEGIN__: - .4byte $LECIE1-$LSCIE1 -$LSCIE1: + .4byte LECIE1-LSCIE1 +LSCIE1: .4byte 0x0 .byte 0x1 .ascii "z\0" @@ -18,15 +18,15 @@ $LSCIE1: .byte 0x4 .4byte 1 .p2align 1 -$LECIE1: -$LSFDE1: - .4byte $LEFDE1-$LASFDE1 -$LASFDE1: - .4byte $LASFDE1-__FRAME_BEGIN__ - .4byte $LFB1 - .4byte $LFE1-$LFB1 +LECIE1: +LSFDE1: + .4byte LEFDE1-LASFDE1 +LASFDE1: + .4byte LASFDE1-__FRAME_BEGIN__ + .4byte LFB1 + .4byte LFE1-LFB1 .byte 0x4 - .4byte $LFE1-$LFB1 + .4byte LFE1-LFB1 .byte 0x4 - .4byte $L1-$LFB1 -$LEFDE1: + .4byte L1-LFB1 +LEFDE1: diff --git a/gas/testsuite/gas/ieee-fp/x930509a.exp b/gas/testsuite/gas/ieee-fp/x930509a.exp index 4218c8751a..cd48b41760 100644 --- a/gas/testsuite/gas/ieee-fp/x930509a.exp +++ b/gas/testsuite/gas/ieee-fp/x930509a.exp @@ -22,7 +22,7 @@ proc dotest {} { # C54x alignment/addressing is different, so the listing looks different # float encoding is tested in c54x-specific tests. # No floating point support in assembly code for CRIS. -if { ![istarget vax*-*-*] && ![istarget *c54x*-*-*] +if { ![istarget vax*-*-*] && ![istarget *c54x*-*-*] && ![istarget *c30*-*-*] && ![istarget cris-*-*] && ![istarget arc*-*-*] } then { dotest } diff --git a/gas/testsuite/gas/m68hc11/malis.d b/gas/testsuite/gas/m68hc11/malis.d index 73993c8241..8f5ad407df 100644 --- a/gas/testsuite/gas/m68hc11/malis.d +++ b/gas/testsuite/gas/m68hc11/malis.d @@ -1,5 +1,5 @@ #objdump: -d --prefix-addresses -#as: -m68hc11 --mri -I../testsuite/gas/m68hc11/ +#as: -m68hc11 --mri -I$srcdir/$subdir #name: Motorola Assembly Language Input Standard # Test compliance with MALIS diff --git a/gas/testsuite/gas/mri/mri.exp b/gas/testsuite/gas/mri/mri.exp index 48c3bb7c65..7a280c568d 100644 --- a/gas/testsuite/gas/mri/mri.exp +++ b/gas/testsuite/gas/mri/mri.exp @@ -21,7 +21,7 @@ run_dump_test comment gas_test "empty.s" "-M" "" "MRI empty macro" run_dump_test semi -if {[istarget "m6811-*-*"] || [istarget "m6812-*-*"]} { +if {[istarget "m6811-*"] || [istarget "m6812-*"] || [istarget "m68hc*-*"]} { return } diff --git a/gas/testsuite/gas/sh/basic.exp b/gas/testsuite/gas/sh/basic.exp index e3b4d90f35..83510c352e 100644 --- a/gas/testsuite/gas/sh/basic.exp +++ b/gas/testsuite/gas/sh/basic.exp @@ -70,6 +70,37 @@ proc do_fp {} { -re "^ +\[0-9\]+ 0038 4352\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 003a 036A\[^\n\]*\n" { set x [expr $x+1] } -re "^ +\[0-9\]+ 003c 4362\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0000 08F0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0002 0AF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0004 09F0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0006 0BF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0008 06F0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000a 07F0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000c 0CF1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 000e 8DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0010 9DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0012 00F1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0014 01F1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0016 02F1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0018 03F1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001a 0EF1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001c 04F1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 001e 05F1\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0020 4DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0022 5DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0024 6DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0026 2DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0028 3DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 002a 0DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 002c 1DF0\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 002e 5A43\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0030 5643\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0032 6A43\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0034 6643\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0036 5A03\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 0038 5243\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 003a 6A03\[^\n\]*\n" { set x [expr $x+1] } + -re "^ +\[0-9\]+ 003c 6243\[^\n\]*\n" { set x [expr $x+1] } -re "\[^\n\]*\n" { } timeout { perror "timeout\n"; break } eof { break } @@ -91,7 +122,7 @@ if [istarget sh*-*-*] then { # coff is missing information about the machine type, so everything is # dumped as sh4. - if {[istarget sh*-*coff] || [istarget sh*-hms]} then { + if {[istarget sh*-*coff] || [istarget sh*-pe*] || [istarget sh*-rtems]} then { run_dump_test "pcrel-coff" } else { # Test DSP instructions diff --git a/gas/testsuite/gas/sh/pcrel-coff.d b/gas/testsuite/gas/sh/pcrel-coff.d index 4255392e0d..eaca1fd7ce 100644 --- a/gas/testsuite/gas/sh/pcrel-coff.d +++ b/gas/testsuite/gas/sh/pcrel-coff.d @@ -1,5 +1,5 @@ #as: -big -#objdump: -d +#objdump: -d -EB #name: PC-relative loads .*: file format .*sh.* diff --git a/gas/testsuite/gas/vtable/vtable.exp b/gas/testsuite/gas/vtable/vtable.exp index 62d0affff8..7e2c602037 100644 --- a/gas/testsuite/gas/vtable/vtable.exp +++ b/gas/testsuite/gas/vtable/vtable.exp @@ -17,35 +17,36 @@ proc run_list_test { name opts } { # Vtable bits are only supported by ELF targets. if { ( [istarget "*-*-elf*"] || [istarget "*-*-linux*"]) && ![istarget *-*-linux*aout*] + && ![istarget *-*-linux*ecoff*] && ![istarget *-*-linux*oldld*] } then { # These tests are not (yet) supported on some targets. - if { [istarget "ia64-*"] - || [istarget "hppa*64*-*-*"] - || [istarget "i960-*-*"] - || [istarget "arc*-*-*"] - || [istarget "alpha*-*-*"] - || [istarget "sparc64*-*-*"] - || [istarget "h8300*-*-*"] - || [istarget "d30v-*-*"] } then { - return - } - - # not yet supported by ARC - if {[istarget "arc*-*-*"]} { - return - } + setup_xfail "alpha*-*" "arc-*" "avr-*" "d30v-*" + setup_xfail "h8300*-*" "hppa*64*-*-*hpux*" + setup_xfail "i370-*" "i960-*" "ia64-*" "ip2k-*" + setup_xfail "mn10200-*" "or32-*" "sparc64*-*" + run_dump_test "inherit0" - run_dump_test "inherit0" + # This particular test is supposed to fail.. run_list_test "inherit1" "-al" + setup_xfail "alpha*-*" "arc-*" "avr-*" "d30v-*" + setup_xfail "h8300*-*" "hppa*64*-*-*hpux*" + setup_xfail "i370-*" "i960-*" "ia64-*" "ip2k-*" + setup_xfail "mn10200-*" "or32-*" "sparc64*-*" + # The vtable entry results are different on Rel and Rela targets. - if {[istarget "i*86-*-*"] - || [istarget "d10v-*-*"] - || [istarget "mips*-*-*"] - || [istarget "strongarm*-*-*"] - || [istarget "xscale*-*-*"] - || [istarget "arm*-*-*"] } then { + if {[istarget "arm*-*"] + || [istarget "arc-*"] + || [istarget "d10v-*"] + || [istarget "dlx-*"] + || [istarget "i*86-*"] + || [istarget "m32r-*"] + || [istarget "mips*-*"] + || [istarget "m68hc*-*"] + || [istarget "or32-*"] + || [istarget "strongarm*-*"] + || [istarget "xscale*-*"] } then { run_dump_test "entry0" -- 2.34.1