Fix simple gas testsuite failures.

[deliverable/binutils-gdb.git] / gas / testsuite / gas / cfi / cfi.exp

diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
index 4a8d3bae62afe47643a6f4a5fcda5e03234177c3..9b6012e1031ee6e0067e7332ef0ab27639753303 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi.exp
+++ b/gas/testsuite/gas/cfi/cfi.exp
@@ -64,6 +64,25 @@ if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
     run_dump_test "cfi-alpha-2"
     run_dump_test "cfi-alpha-3"
 
+} elseif { [istarget "arc*-*-*"] } then {
+    run_dump_test "cfi-arc-1"
+
+} elseif { [istarget "arm*-*"] } then {
+    # Only ELF based ARM targets support CFI.
+    if { [is_pecoff_format] } then {
+       return
+    }
+    run_dump_test "cfi-arm-1"
+
+} elseif { [istarget "hppa*-linux*"] } then {
+    run_dump_test "cfi-hppa-1"
+
+} elseif { [istarget "m68*-*"] && ![istarget "m68hc1*-*"] } then {
+    run_dump_test "cfi-m68k"
+
+} elseif { [istarget "mips*-*"] } then {
+    run_dump_test "cfi-mips-1"
+
 } elseif { [istarget powerpc*-*-*] } then {
     run_dump_test "cfi-ppc-1"
 
@@ -73,8 +92,15 @@ if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
        run_dump_test "cfi-s390x-1"
     }
 
-} elseif { [istarget "m68*-*"] && ![istarget "m68hc1*-*"] } then {
-    run_dump_test "cfi-m68k"
+} elseif [istarget "sh*-*"] then {
+    if { [istarget "*-pe" ] || [istarget "*-rtemscoff*"] } then {
+       return
+    }
+
+    if { [istarget sh64*-*-*] || [istarget sh5*-*-*] } then {
+    } else {
+       run_dump_test "cfi-sh-1"
+    }
 
 } elseif { [istarget sparc*-*-*] } then {
     global NM
@@ -86,24 +112,6 @@ if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
        run_dump_test "cfi-sparc64-1"
     }
 
-} elseif [istarget "sh*-*"] then {
-    if { [istarget sh64*-*-*] || [istarget sh5*-*-*] } then {
-    } else {
-       run_dump_test "cfi-sh-1"
-    }
-} elseif { [istarget "arc*-*-*"] } then {
-    run_dump_test "cfi-arc-1"
-} elseif { [istarget "arm*-*"] } then {
-    # Only ELF based ARM targets support CFI.
-    if { [is_pecoff_format] } then {
-       return
-    }
-    run_dump_test "cfi-arm-1"
-
-} elseif { [istarget "mips*-*"] } then {
-    run_dump_test "cfi-mips-1"
-} elseif { [istarget "hppa*-linux*"] } then {
-    run_dump_test "cfi-hppa-1"
 } else {
     return
 }