diff options
Diffstat (limited to 'gas/testsuite')
-rw-r--r-- | gas/testsuite/ChangeLog | 10 | ||||
-rw-r--r-- | gas/testsuite/gas/all/gas.exp | 4 | ||||
-rw-r--r-- | gas/testsuite/gas/arm/arm.exp | 2 | ||||
-rw-r--r-- | gas/testsuite/gas/cfi/cfi.exp | 2 | ||||
-rw-r--r-- | gas/testsuite/gas/elf/elf.exp | 6 |
5 files changed, 16 insertions, 8 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 62fa86d..d77b730 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2011-04-06 Joseph Myers <joseph@codesourcery.com> + + * gas/all/gas.exp (*arm*-*-coff): Change to arm*-*-coff. + (thumb*-*-coff, thumb*-*-pe*): Don;t handle. + * gas/arm/arm.exp (*arm*-*-*): Change to arm*-*-*. + (*xscale*-*-*): Don't handle. + * gas/cfi/cfi.exp (xscale*-*): Don't handle. + * gas/elf/elf.exp (*arm*-*-*): Change to arm*-*-*. + (xscale*-*-*): Don't handle. + 2011-03-31 Bernd Schmidt <bernds@codesourcery.com> * gas/tic6x/scomm-directive-1.s: New test. diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp index f9330d9..70210c0 100644 --- a/gas/testsuite/gas/all/gas.exp +++ b/gas/testsuite/gas/all/gas.exp @@ -285,8 +285,8 @@ case $target_triplet in { # We omit the ARM toolchains because they define locals to # start with '.', which eliminates .eos, .text etc from the output. # Omit c54x, since .tag and .def mean something different on that target -if { ([istarget *-*-coff*] && ![istarget *arm*-*-coff] && ![istarget thumb*-*-coff] && ![istarget xscale-*-coff] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \ - ||([istarget *-*-pe*] && ![istarget arm*-*-pe*] && ![istarget thumb*-*-pe*]) \ +if { ([istarget *-*-coff*] && ![istarget arm*-*-coff] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \ + ||([istarget *-*-pe*] && ![istarget arm*-*-pe*]) \ || [istarget i*86-*-aix*] \ || [istarget i*86-*-sco*] \ || [istarget i*86-*-isc*] \ diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp index 56aef3b..9f494a3 100644 --- a/gas/testsuite/gas/arm/arm.exp +++ b/gas/testsuite/gas/arm/arm.exp @@ -2,6 +2,6 @@ # Some ARM tests # -if {[istarget *arm*-*-*] || [istarget *xscale*-*-*]} { +if {[istarget arm*-*-*]} { run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]] } diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp index c5e3acf..dfe0cf5 100644 --- a/gas/testsuite/gas/cfi/cfi.exp +++ b/gas/testsuite/gas/cfi/cfi.exp @@ -72,7 +72,7 @@ if { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then { run_dump_test "cfi-sh-1" } -} elseif { [istarget "arm*-*"] || [istarget "xscale*-*"] } then { +} elseif { [istarget "arm*-*"] } then { # Only ELF based ARM targets support CFI. if { [is_pecoff_format] } then { return diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp index 8bfeb95..6eff0dd 100644 --- a/gas/testsuite/gas/elf/elf.exp +++ b/gas/testsuite/gas/elf/elf.exp @@ -69,8 +69,7 @@ if { ([istarget "*-*-*elf*"] if {[istarget "rx-*-*"]} then { set target_machine -rx } - if { ([istarget "*arm*-*-*"] - || [istarget "xscale*-*-*"]) } { + if {[istarget "arm*-*-*"]} { if { ([istarget "*-*-*eabi"] || [istarget "*-*-linux-*"] @@ -165,8 +164,7 @@ if { ([istarget "*-*-*elf*"] # So for these targets we cannot include an IFUNC symbol type # in the symbol type test. if { [istarget "msp*-*-*"] - || [istarget "arm*-*-*"] - || [istarget "xscale*-*-*"]} then { + || [istarget "arm*-*-*"]} then { run_elf_list_test "type-noifunc" "" "" "-s" "| grep \"1 *\\\[FONTC\\\]\"" } else { run_dump_test ifunc-1 |