sim: testsuite: cleanup the istarget * logic

Now that the multitarget testing has settled, clean up the cases where
istarget * is used.  This ends up being mostly style unindenting.

46 files changed, 332 insertions, 467 deletions

diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp
index e09d15739b..abc11462f0 100644
--- a/sim/testsuite/aarch64/allinsn.exp
+++ b/sim/testsuite/aarch64/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "aarch64"
+# all machines
+set all_machs "aarch64"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/arm/allinsn.exp b/sim/testsuite/arm/allinsn.exp
index da28b69e51..95a5759a56 100644
--- a/sim/testsuite/arm/allinsn.exp
+++ b/sim/testsuite/arm/allinsn.exp
@@ -2,18 +2,14 @@
 
 sim_init
 
-if { [istarget *] } {
-    # all machines
-    set all_machs "xscale"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "xscale"
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
index 19a78a201e..3e0fb33342 100644
--- a/sim/testsuite/arm/iwmmxt/iwmmxt.exp
+++ b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
@@ -2,18 +2,14 @@
 
 sim_init
 
-if { [istarget *] } {
-    # all machines
-    set all_machs "xscale"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "xscale"
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/arm/misc.exp b/sim/testsuite/arm/misc.exp
index 47d714cce2..5ba5f648bb 100644
--- a/sim/testsuite/arm/misc.exp
+++ b/sim/testsuite/arm/misc.exp
@@ -2,18 +2,14 @@
 
 sim_init
 
-if { [istarget *] } {
-    # all machines
-    set all_machs "arm7tdmi"
-
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "arm7tdmi"
+
+# The .ms suffix is for "miscellaneous .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/arm/thumb/allthumb.exp b/sim/testsuite/arm/thumb/allthumb.exp
index 36eb29c08f..db1d00d131 100644
--- a/sim/testsuite/arm/thumb/allthumb.exp
+++ b/sim/testsuite/arm/thumb/allthumb.exp
@@ -2,18 +2,14 @@
 
 sim_init
 
-if { [istarget *] } {
-    # all machines
-    set all_machs "arm7tdmi"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "arm7tdmi"
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/arm/xscale/xscale.exp b/sim/testsuite/arm/xscale/xscale.exp
index 80faf5c119..0e5a7549b5 100644
--- a/sim/testsuite/arm/xscale/xscale.exp
+++ b/sim/testsuite/arm/xscale/xscale.exp
@@ -2,18 +2,14 @@
 
 sim_init
 
-if { [istarget *] } {
-    # all machines
-    set all_machs "xscale"
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "xscale"
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/avr/allinsn.exp b/sim/testsuite/avr/allinsn.exp
index 56b6e39688..4664686fb5 100644
--- a/sim/testsuite/avr/allinsn.exp
+++ b/sim/testsuite/avr/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "avr"
+# all machines
+set all_machs "avr"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp
index d6a45304e3..fccad36c86 100644
--- a/sim/testsuite/bfin/allinsn.exp
+++ b/sim/testsuite/bfin/allinsn.exp
@@ -6,16 +6,13 @@ global CFLAGS_FOR_TARGET_init
 set CFLAGS_FOR_TARGET_init "-mcpu=bf537"
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "bfin"
+# all machines
+set all_machs "bfin"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.\[csS\]]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.\[csS\]]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/bpf/allinsn.exp b/sim/testsuite/bpf/allinsn.exp
index 88752b8e56..98f0346776 100644
--- a/sim/testsuite/bpf/allinsn.exp
+++ b/sim/testsuite/bpf/allinsn.exp
@@ -2,23 +2,19 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "bpf"
+# all machines
+set all_machs "bpf"
 
-    global SIMFLAGS_FOR_TARGET
-    set SIMFLAGS_FOR_TARGET "--memory-size=4Mb"
+global SIMFLAGS_FOR_TARGET
+set SIMFLAGS_FOR_TARGET "--memory-size=4Mb"
 
-    global LDFLAGS_FOR_TARGET
-    set LDFLAGS_FOR_TARGET "-Ttext=0x0"
+global LDFLAGS_FOR_TARGET
+set LDFLAGS_FOR_TARGET "-Ttext=0x0"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp
index 39b464a85f..1bdda16635 100644
--- a/sim/testsuite/cr16/allinsn.exp
+++ b/sim/testsuite/cr16/allinsn.exp
@@ -2,23 +2,19 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "cr16"
+# all machines
+set all_machs "cr16"
 
-    global SIMFLAGS_FOR_TARGET
-    # The cr16 linker sets the default LMA base to 0, and all the code
-    # expects the VMA when running, so use that when running the tests.
-    set SIMFLAGS_FOR_TARGET "--load-vma"
+global SIMFLAGS_FOR_TARGET
+# The cr16 linker sets the default LMA base to 0, and all the code
+# expects the VMA when running, so use that when running the tests.
+set SIMFLAGS_FOR_TARGET "--load-vma"
 
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/cr16/misc.exp b/sim/testsuite/cr16/misc.exp
index 4d42667b0a..40cdd965cf 100644
--- a/sim/testsuite/cr16/misc.exp
+++ b/sim/testsuite/cr16/misc.exp
@@ -2,23 +2,19 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "cr16"
+# all machines
+set all_machs "cr16"
 
-    global SIMFLAGS_FOR_TARGET
-    # The cr16 linker sets the default LMA base to 0, and all the code
-    # expects the VMA when running, so use that when running the tests.
-    set SIMFLAGS_FOR_TARGET "--load-vma"
+global SIMFLAGS_FOR_TARGET
+# The cr16 linker sets the default LMA base to 0, and all the code
+# expects the VMA when running, so use that when running the tests.
+set SIMFLAGS_FOR_TARGET "--load-vma"
 
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# The .ms suffix is for "miscellaneous .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp
index 6fed30acbd..fe6b373ac4 100644
--- a/sim/testsuite/cris/asm/asm.exp
+++ b/sim/testsuite/cris/asm/asm.exp
@@ -17,31 +17,29 @@
 
 sim_init
 
-if [istarget *] {
-    global ASFLAGS_FOR_TARGET
-    # All machines we test and the corresponding assembler option.  Needs
-    # update if we build the simulator for crisv0 crisv3 and crisv8 too.
-
-    set combos {{"crisv10" "--march=v10 --no-mul-bug-abort"}
-                {"crisv32" "--march=v32"}}
-
-    # We need to pass different assembler flags for each machine.
-    # Specifying it here rather than adding a specifier to each and every
-    # test-file is preferrable.
-
-    foreach combo $combos {
-	set mach [lindex $combo 0]
-	set ASFLAGS_FOR_TARGET "[lindex $combo 1]"
-
-	# The .ms suffix is for "miscellaneous .s".
-	foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	    # If we're only testing specific files and this isn't one of them,
-	    # skip it.
-	    if ![runtest_file_p $runtests $src] {
-		continue
-	    }
-
-	    run_sim_test $src $mach
+global ASFLAGS_FOR_TARGET
+# All machines we test and the corresponding assembler option.  Needs
+# update if we build the simulator for crisv0 crisv3 and crisv8 too.
+
+set combos {{"crisv10" "--march=v10 --no-mul-bug-abort"}
+	    {"crisv32" "--march=v32"}}
+
+# We need to pass different assembler flags for each machine.
+# Specifying it here rather than adding a specifier to each and every
+# test-file is preferrable.
+
+foreach combo $combos {
+    set mach [lindex $combo 0]
+    set ASFLAGS_FOR_TARGET "[lindex $combo 1]"
+
+    # The .ms suffix is for "miscellaneous .s".
+    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
+	# If we're only testing specific files and this isn't one of them,
+	# skip it.
+	if ![runtest_file_p $runtests $src] {
+	    continue
 	}
+
+	run_sim_test $src $mach
     }
 }
diff --git a/sim/testsuite/d10v/allinsn.exp b/sim/testsuite/d10v/allinsn.exp
index 97265a15db..430c22e260 100644
--- a/sim/testsuite/d10v/allinsn.exp
+++ b/sim/testsuite/d10v/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "d10v"
+# all machines
+set all_machs "d10v"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/example-synacor/allinsn.exp b/sim/testsuite/example-synacor/allinsn.exp
index 07401ced9b..f751f3117e 100644
--- a/sim/testsuite/example-synacor/allinsn.exp
+++ b/sim/testsuite/example-synacor/allinsn.exp
@@ -2,19 +2,16 @@
 
 sim_init
 
-if [istarget *] {
-    # All machines.
-    set all_machs "example"
+# All machines.
+set all_machs "example"
 
-    global LDFLAGS_FOR_TARGET
-    set LDFLAGS_FOR_TARGET "-Ttext=0"
+global LDFLAGS_FOR_TARGET
+set LDFLAGS_FOR_TARGET "-Ttext=0"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/frv/allinsn-a-b.exp b/sim/testsuite/frv/allinsn-a-b.exp
index c24cd42fb1..6831231e33 100644
--- a/sim/testsuite/frv/allinsn-a-b.exp
+++ b/sim/testsuite/frv/allinsn-a-b.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[a-b\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-c.exp b/sim/testsuite/frv/allinsn-c.exp
index e1672e8f27..2d82fb4754 100644
--- a/sim/testsuite/frv/allinsn-c.exp
+++ b/sim/testsuite/frv/allinsn-c.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[c\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-d-h.exp b/sim/testsuite/frv/allinsn-d-h.exp
index 8c29369035..42645e1c65 100644
--- a/sim/testsuite/frv/allinsn-d-h.exp
+++ b/sim/testsuite/frv/allinsn-d-h.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[d-h\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-i-l.exp b/sim/testsuite/frv/allinsn-i-l.exp
index 10b8793cee..faa07cde1e 100644
--- a/sim/testsuite/frv/allinsn-i-l.exp
+++ b/sim/testsuite/frv/allinsn-i-l.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[i-l\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-m.exp b/sim/testsuite/frv/allinsn-m.exp
index e3733e0555..aba9507737 100644
--- a/sim/testsuite/frv/allinsn-m.exp
+++ b/sim/testsuite/frv/allinsn-m.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[m\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-n.exp b/sim/testsuite/frv/allinsn-n.exp
index e6c41b414f..3b41fef321 100644
--- a/sim/testsuite/frv/allinsn-n.exp
+++ b/sim/testsuite/frv/allinsn-n.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[n\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-o-s.exp b/sim/testsuite/frv/allinsn-o-s.exp
index 98906e81bc..6e172fc38d 100644
--- a/sim/testsuite/frv/allinsn-o-s.exp
+++ b/sim/testsuite/frv/allinsn-o-s.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[o-s\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/allinsn-t-z.exp b/sim/testsuite/frv/allinsn-t-z.exp
index 04b0e5709c..52610c2ab8 100644
--- a/sim/testsuite/frv/allinsn-t-z.exp
+++ b/sim/testsuite/frv/allinsn-t-z.exp
@@ -8,8 +8,7 @@ set cpu_option -mcpu
 
 # The .cgs suffix is for "cgen .s".
 foreach src [lsort [glob -nocomplain $srcdir/$subdir/\[t-z\]*.cgs]] {
-    # If we're only testing specific files and this isn't one of them,
-    # skip it.
+    # If we're only testing specific files and this isn't one of them, skip it.
     if ![runtest_file_p $runtests $src] {
 	continue
     }
diff --git a/sim/testsuite/frv/fr400/allinsn.exp b/sim/testsuite/frv/fr400/allinsn.exp
index 4f92f227d9..b4fa18630c 100644
--- a/sim/testsuite/frv/fr400/allinsn.exp
+++ b/sim/testsuite/frv/fr400/allinsn.exp
@@ -2,18 +2,15 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "fr400 fr405 fr450 fr550"
-    set cpu_option -mcpu
+# all machines
+set all_machs "fr400 fr405 fr450 fr550"
+set cpu_option -mcpu
 
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/frv/fr500/allinsn.exp b/sim/testsuite/frv/fr500/allinsn.exp
index ec1309a244..4e7360cb44 100644
--- a/sim/testsuite/frv/fr500/allinsn.exp
+++ b/sim/testsuite/frv/fr500/allinsn.exp
@@ -2,18 +2,15 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "frv fr500 fr550"
-    set cpu_option -mcpu
+# all machines
+set all_machs "frv fr500 fr550"
+set cpu_option -mcpu
 
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/frv/fr550/allinsn.exp b/sim/testsuite/frv/fr550/allinsn.exp
index 56df37d427..6b4ce7774c 100644
--- a/sim/testsuite/frv/fr550/allinsn.exp
+++ b/sim/testsuite/frv/fr550/allinsn.exp
@@ -2,18 +2,15 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "fr550"
-    set cpu_option -mcpu
+# all machines
+set all_machs "fr550"
+set cpu_option -mcpu
 
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/frv/interrupts.exp b/sim/testsuite/frv/interrupts.exp
index ec83de422e..fe88591acf 100644
--- a/sim/testsuite/frv/interrupts.exp
+++ b/sim/testsuite/frv/interrupts.exp
@@ -2,18 +2,15 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "frv fr500 fr550 fr400"
-    set cpu_option -mcpu
+# all machines
+set all_machs "frv fr500 fr550 fr400"
+set cpu_option -mcpu
 
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/interrupts/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/interrupts/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/frv/misc.exp b/sim/testsuite/frv/misc.exp
index 21877f9633..b5cacf8074 100644
--- a/sim/testsuite/frv/misc.exp
+++ b/sim/testsuite/frv/misc.exp
@@ -2,18 +2,15 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "frv fr500 fr550 fr400 fr405 fr450"
-    set cpu_option -mcpu
+# all machines
+set all_machs "frv fr500 fr550 fr400 fr405 fr450"
+set cpu_option -mcpu
 
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .ms suffix is for "miscellaneous .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/frv/parallel.exp b/sim/testsuite/frv/parallel.exp
index 00bcccd66e..5fe27087ef 100644
--- a/sim/testsuite/frv/parallel.exp
+++ b/sim/testsuite/frv/parallel.exp
@@ -2,18 +2,15 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "frv fr500 fr550 fr400"
-    set cpu_option -mcpu
+# all machines
+set all_machs "frv fr500 fr550 fr400"
+set cpu_option -mcpu
 
-    # The .pcgs suffix is for "parallel cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.pcgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .pcgs suffix is for "parallel cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.pcgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/ft32/allinsn.exp b/sim/testsuite/ft32/allinsn.exp
index 260f13e1ce..bd3a6bb10a 100644
--- a/sim/testsuite/ft32/allinsn.exp
+++ b/sim/testsuite/ft32/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "ft32"
+# all machines
+set all_machs "ft32"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/h8300/allinsn.exp b/sim/testsuite/h8300/allinsn.exp
index f270661f02..4f0e6db91b 100644
--- a/sim/testsuite/h8300/allinsn.exp
+++ b/sim/testsuite/h8300/allinsn.exp
@@ -2,16 +2,12 @@
 
 sim_init
 
-if {[istarget *]} {
-    set all_machs "h8300 h8300h h8300s h8sx"
+set all_machs "h8300 h8300h h8300s h8sx"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/iq2000/allinsn.exp b/sim/testsuite/iq2000/allinsn.exp
index 30a1c94ea6..554c6aedf5 100644
--- a/sim/testsuite/iq2000/allinsn.exp
+++ b/sim/testsuite/iq2000/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "iq2000"
+# all machines
+set all_machs "iq2000"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/lm32/allinsn.exp b/sim/testsuite/lm32/allinsn.exp
index fb5d4d3471..67c70ecadd 100644
--- a/sim/testsuite/lm32/allinsn.exp
+++ b/sim/testsuite/lm32/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "lm32"
+# all machines
+set all_machs "lm32"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/m32c/allinsn.exp b/sim/testsuite/m32c/allinsn.exp
index c979514f5d..4df54fb8c8 100644
--- a/sim/testsuite/m32c/allinsn.exp
+++ b/sim/testsuite/m32c/allinsn.exp
@@ -3,16 +3,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "m32c"
+# all machines
+set all_machs "m32c"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/m32r/allinsn.exp b/sim/testsuite/m32r/allinsn.exp
index c20fc86558..fb8646f8cc 100644
--- a/sim/testsuite/m32r/allinsn.exp
+++ b/sim/testsuite/m32r/allinsn.exp
@@ -2,19 +2,14 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "m32r"
-
-
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "m32r"
+
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/m32r/misc.exp b/sim/testsuite/m32r/misc.exp
index 2ca2c03018..c5a0c7d440 100644
--- a/sim/testsuite/m32r/misc.exp
+++ b/sim/testsuite/m32r/misc.exp
@@ -2,19 +2,14 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "m32r"
-
-
-    # The .ms suffix is for "miscellaneous .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+# all machines
+set all_machs "m32r"
+
+# The .ms suffix is for "miscellaneous .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.ms]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/m68hc11/allinsn.exp b/sim/testsuite/m68hc11/allinsn.exp
index 09653a00c4..5a10cc5131 100644
--- a/sim/testsuite/m68hc11/allinsn.exp
+++ b/sim/testsuite/m68hc11/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "m68hc11"
+# all machines
+set all_machs "m68hc11"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/mcore/allinsn.exp b/sim/testsuite/mcore/allinsn.exp
index 64747752a8..3333fdc3ae 100644
--- a/sim/testsuite/mcore/allinsn.exp
+++ b/sim/testsuite/mcore/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "mcore"
+# all machines
+set all_machs "mcore"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/microblaze/allinsn.exp b/sim/testsuite/microblaze/allinsn.exp
index 3f582b033d..97dc6ec462 100644
--- a/sim/testsuite/microblaze/allinsn.exp
+++ b/sim/testsuite/microblaze/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "microblaze"
+# all machines
+set all_machs "microblaze"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/mn10300/allinsn.exp b/sim/testsuite/mn10300/allinsn.exp
index 3e5903ac7b..96a1c150c6 100644
--- a/sim/testsuite/mn10300/allinsn.exp
+++ b/sim/testsuite/mn10300/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "mn10300"
+# all machines
+set all_machs "mn10300"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/moxie/allinsn.exp b/sim/testsuite/moxie/allinsn.exp
index 3f2f0a7ac3..30871685a2 100644
--- a/sim/testsuite/moxie/allinsn.exp
+++ b/sim/testsuite/moxie/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "moxie"
+# all machines
+set all_machs "moxie"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/msp430/allinsn.exp b/sim/testsuite/msp430/allinsn.exp
index 888afa918d..ee56936cb9 100644
--- a/sim/testsuite/msp430/allinsn.exp
+++ b/sim/testsuite/msp430/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "msp430"
+# all machines
+set all_machs "msp430"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/or1k/alltests.exp b/sim/testsuite/or1k/alltests.exp
index 1b26e5b201..15a7fd47c7 100644
--- a/sim/testsuite/or1k/alltests.exp
+++ b/sim/testsuite/or1k/alltests.exp
@@ -17,19 +17,14 @@
 
 sim_init
 
-if [istarget *] {
-    set all_machs "or1k"
+set all_machs "or1k"
 
-    global LDFLAGS_FOR_TARGET
-    set LDFLAGS_FOR_TARGET "-T $srcdir/$subdir/or1k-test.ld"
+global LDFLAGS_FOR_TARGET
+set LDFLAGS_FOR_TARGET "-T $srcdir/$subdir/or1k-test.ld"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.S]] {
-
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.S]] {
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
-
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/pru/allinsn.exp b/sim/testsuite/pru/allinsn.exp
index 9b98e22e72..465582f563 100644
--- a/sim/testsuite/pru/allinsn.exp
+++ b/sim/testsuite/pru/allinsn.exp
@@ -20,16 +20,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "pru"
+# all machines
+set all_machs "pru"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/riscv/allinsn.exp b/sim/testsuite/riscv/allinsn.exp
index db310c30ea..972edf4d5e 100644
--- a/sim/testsuite/riscv/allinsn.exp
+++ b/sim/testsuite/riscv/allinsn.exp
@@ -2,16 +2,13 @@
 
 sim_init
 
-if [istarget *] {
-    # all machines
-    set all_machs "riscv"
+# all machines
+set all_machs "riscv"
 
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/sh/allinsn.exp b/sim/testsuite/sh/allinsn.exp
index 69d324ae91..4eabdf2602 100644
--- a/sim/testsuite/sh/allinsn.exp
+++ b/sim/testsuite/sh/allinsn.exp
@@ -14,8 +14,6 @@ foreach opt $board_variant_list {
     }
 }
 
-if [istarget *] {
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
-	run_sim_test $src $all_machs
-    }
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {
+    run_sim_test $src $all_machs
 }
diff --git a/sim/testsuite/v850/allinsns.exp b/sim/testsuite/v850/allinsns.exp
index 1aa80249f9..4cc461c30f 100644
--- a/sim/testsuite/v850/allinsns.exp
+++ b/sim/testsuite/v850/allinsns.exp
@@ -2,23 +2,20 @@
 
 sim_init
 
-if [istarget *] {
-    # All machines.
-    # Should add more cpus if the testsuite adds coverage for their insns, but
-    # at the core level, there's no deviation beyond these two.
-    set all_machs "v850e v850"
+# All machines.
+# Should add more cpus if the testsuite adds coverage for their insns, but
+# at the core level, there's no deviation beyond these two.
+set all_machs "v850e v850"
 
-    # gas doesn't support any '=' option for v850.
-    set cpu_option_sep ""
-    set cpu_option -m
+# gas doesn't support any '=' option for v850.
+set cpu_option_sep ""
+set cpu_option -m
 
-    # The .cgs suffix is for "cgen .s".
-    foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
-	# If we're only testing specific files and this isn't one of them,
-	# skip it.
-	if ![runtest_file_p $runtests $src] {
-	    continue
-	}
-	run_sim_test $src $all_machs
+# The .cgs suffix is for "cgen .s".
+foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.cgs]] {
+    # If we're only testing specific files and this isn't one of them, skip it.
+    if ![runtest_file_p $runtests $src] {
+	continue
     }
+    run_sim_test $src $all_machs
 }