diff options
| author | Alan Modra <amodra@gmail.com> | 2020-09-17 17:32:59 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2020-09-17 17:42:53 +0930 |
| commit | 848471acef1d11dcc3361b79e5bda69d4700fdf1 (patch) | |
| tree | d4e718bc88fa7b96a950b27f6ae3cb4f7840a94a | |
| parent | c568ac5ff708eebf6ef424e5863d3dbd874a3f62 (diff) | |
| download | binutils-gdb-848471acef1d11dcc3361b79e5bda69d4700fdf1.tar.gz | |
Tidy gas i386.exp
Possibly a quirk of my version of tcl, but I see "nm-new --help" being
run on non-x86 targets.
* testsuite/gas/i386/i386.exp: Return early if not x86.
| -rw-r--r-- | gas/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/i386/i386.exp | 68 |
2 files changed, 38 insertions, 34 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 4852d4ab177..6b788859487 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2020-09-17 Alan Modra <amodra@gmail.com> + + * testsuite/gas/i386/i386.exp: Return early if not x86. + 2020-09-16 Alan Modra <amodra@gmail.com> * config/obj-elf.c (obj_elf_visibility, elf_frob_symbol): Adjust diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp index 0efcc8c7c27..132e5d78346 100644 --- a/gas/testsuite/gas/i386/i386.exp +++ b/gas/testsuite/gas/i386/i386.exp @@ -17,6 +17,10 @@ # # i386 tests # +if { ![istarget "i*86-*-*"] && ![istarget "x86_64-*-*"] } then { + return +} + proc gas_64_check { } { global NM global NMFLAGS @@ -40,8 +44,7 @@ proc gas_bfd64_check { } { return [regexp "32bit/64bit/x32" [lindex $status 1]]; } -if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]] then { - +if [gas_32_check] then { global ASFLAGS set old_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS --32" @@ -674,42 +677,39 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_32_check]] } # Common tests -if [expr [istarget "i*86-*-*"] || [istarget "x86_64-*-*"]] then { - if {![istarget "i*86-*-elfiamcu"] && [gas_64_check]} then { - run_dump_test "intel-expr" - run_dump_test "string-ok" - } - run_list_test "string-bad" "" - run_list_test "reg-bad" "" - run_list_test "space1" "-al" - run_list_test "xmmword" "" - run_dump_test rept - run_dump_test pr19498 - run_list_test "nop-bad-1" "" - run_list_test "unspec" "" - if {[is_elf_format] || [istarget "*-*-vxworks*"]} then { - run_list_test_stdin "list-1" "-al" - run_list_test_stdin "list-2" "-al" - run_list_test_stdin "list-3" "-al" - run_dump_test "dw2-compress-1" - run_dump_test "dw2-compress-3a" - run_dump_test "dw2-compress-3b" - run_dump_test "dw2-compressed-1" - run_dump_test "dw2-compressed-3a" - run_dump_test "dw2-compressed-3b" +if {![istarget "i*86-*-elfiamcu"] && [gas_64_check]} then { + run_dump_test "intel-expr" + run_dump_test "string-ok" +} +run_list_test "string-bad" "" +run_list_test "reg-bad" "" +run_list_test "space1" "-al" +run_list_test "xmmword" "" +run_dump_test rept +run_dump_test pr19498 +run_list_test "nop-bad-1" "" +run_list_test "unspec" "" +if {[is_elf_format] || [istarget "*-*-vxworks*"]} then { + run_list_test_stdin "list-1" "-al" + run_list_test_stdin "list-2" "-al" + run_list_test_stdin "list-3" "-al" + run_dump_test "dw2-compress-1" + run_dump_test "dw2-compress-3a" + run_dump_test "dw2-compress-3b" + run_dump_test "dw2-compressed-1" + run_dump_test "dw2-compressed-3a" + run_dump_test "dw2-compressed-3b" - if {![istarget "*-*-dragonfly*"] - && ![istarget "*-*-gnu*"] - && ![istarget "*-*-freebsd*"] - && ![istarget "*-*-linux*"] - && ![istarget "*-*-netbsd*"]} then { - run_dump_test "svr4" - } + if {![istarget "*-*-dragonfly*"] + && ![istarget "*-*-gnu*"] + && ![istarget "*-*-freebsd*"] + && ![istarget "*-*-linux*"] + && ![istarget "*-*-netbsd*"]} then { + run_dump_test "svr4" } } -if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] then { - +if [gas_64_check] then { global ASFLAGS set old_ASFLAGS "$ASFLAGS" set ASFLAGS "$ASFLAGS --64 --defsym x86_64=1 --strip-local-absolute" |