sim: testsuite: calculate $arch from $subdir

Since we require ports to use a matching subdir name in the testsuite
tree, we can use that to calculate the $arch value.

sim/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* lib/sim-defs.exp (sim_tool_path): New function.
+	(sim_run): Set sim to [sim_tool_path].
+
 2021-04-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* lib/sim-defs.exp (run_sim_test): Convert examples to binaries.

sim/testsuite/aarch64/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/aarch64/allinsn.exp

@@ -1,10 +1,6 @@
 # AArch64 simulator testsuite
 
 if [istarget aarch64*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "aarch64"
-
     # all machines
     set all_machs "aarch64"
 

sim/testsuite/arm/ChangeLog

@@ -1,3 +1,9 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+	* iwmmxt/iwmmxt.exp, misc.exp, thumb/allthumb.exp, xscale/xscale.exp:
+	Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp, iwmmxt/iwmmxt.exp, misc.exp, thumb/allthumb.ex,

sim/testsuite/arm/allinsn.exp

@@ -1,10 +1,6 @@
 # ARM simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "xscale"
 

sim/testsuite/arm/iwmmxt/iwmmxt.exp

@@ -1,10 +1,6 @@
 # Intel(r) Wireless MMX(tm) technology simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "xscale"
 

sim/testsuite/arm/misc.exp

@@ -1,10 +1,6 @@
 # Miscellaneous ARM simulator testcases
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "arm7tdmi"
 

sim/testsuite/arm/thumb/allthumb.exp

@@ -1,10 +1,6 @@
 # ARM simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "arm7tdmi"
 

sim/testsuite/arm/xscale/xscale.exp

@@ -1,10 +1,6 @@
 # XSCALE simulator testsuite.
 
 if { [istarget arm*-*-*] } {
-    # Used to locate the `run` program.
-    global arch
-    set arch "arm"
-
     # all machines
     set all_machs "xscale"
 

sim/testsuite/avr/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/avr/allinsn.exp

@@ -1,10 +1,6 @@
 # avr simulator testsuite
 
 if [istarget avr-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "avr"
-
     # all machines
     set all_machs "avr"
 

sim/testsuite/bfin/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/bfin/allinsn.exp

@@ -1,10 +1,6 @@
 # Analog Devices Blackfin simulator testsuite
 
 if [istarget bfin-*-elf] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "bfin"
-
     # all machines
     set all_machs "bfin"
 

sim/testsuite/bpf/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/bpf/allinsn.exp

@@ -1,10 +1,6 @@
 # eBPF simulator testsuite
 
 if [istarget bpf-unknown-none] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "bpf"
-
     # all machines
     set all_machs "bpf"
 

sim/testsuite/cr16/ChangeLog

@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+	* misc.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp, misc.exp: Define arch.

sim/testsuite/cr16/allinsn.exp

@@ -1,10 +1,6 @@
 # CR16 simulator testsuite.
 
 if [istarget cr16*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cr16"
-
     # all machines
     set all_machs "cr16"
 

sim/testsuite/cr16/misc.exp

@@ -1,10 +1,6 @@
 # Miscellaneous CR16 simulator testcases
 
 if [istarget cr16*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cr16"
-
     # all machines
     set all_machs "cr16"
 

sim/testsuite/cris/ChangeLog

@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* asm/asm.exp (arch): Delete.
+	* c/c.exp, hw/rv-n-cris/rvc.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* asm/asm.exp, c/c.exp, hw/rv-n-cris/rvc.exp: Define arch.

sim/testsuite/cris/asm/asm.exp

@@ -16,10 +16,6 @@
 # Miscellaneous CRIS simulator testcases in assembly code.
 
 if [istarget cris*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cris"
-
     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.

sim/testsuite/cris/c/c.exp

@@ -19,10 +19,6 @@ if ![istarget cris*-*-*] {
     return
 }
 
-# Used to locate the `run` program.
-global arch
-set arch "cris"
-
 set CFLAGS_FOR_TARGET "-O2"
 if [istarget cris-*-*] {
     set mach "crisv10"

sim/testsuite/cris/hw/rv-n-cris/rvc.exp

@@ -112,10 +112,6 @@ proc slurp_rv { file } {
 # The main test loop.
 
 if [istarget cris*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "cris"
-
     global ASFLAGS_FOR_TARGET
     set has_rv_and_cris [sim_has_rv_and_cris]
     global global_as_options
@@ -129,8 +125,7 @@ if [istarget cris*-*-*] {
     set sim [board_info target sim]
     if [string equal "" $sim] {
 	global objdir
-	global arch
+	set rvdummy "$objdir/cris/rvdummy"
-	set rvdummy "$objdir/../$arch/rvdummy"
     } else {
 	set rvdummy "[file dirname [board_info target sim]]/rvdummy"
     }

sim/testsuite/d10v/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/d10v/allinsn.exp

@@ -1,10 +1,6 @@
 # d10v simulator testsuite.
 
 if [istarget d10v*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "d10v"
-
     # all machines
     set all_machs "d10v"
 

sim/testsuite/example-synacor/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-04-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* add.s, allinsn.exp, and.s, call.s, exit-0.s, gt.s, isa.inc, jmp.s,

sim/testsuite/example-synacor/allinsn.exp

@@ -1,10 +1,6 @@
 # Example synacor simulator testsuite.
 
 if [istarget *] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "example-synacor"
-
     # All machines.
     set all_machs "example"
 

sim/testsuite/frv/ChangeLog

@@ -1,3 +1,9 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+	* fr400/allinsn.exp, fr500/allinsn.exp, fr550/allinsn.exp,
+	interrupts.exp, misc.exp, parallel.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp, fr400/allinsn.exp, fr500/allinsn.exp,

sim/testsuite/frv/allinsn.exp

@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550 fr400 fr405 fr450"
     set cpu_option -mcpu

sim/testsuite/frv/fr400/allinsn.exp

@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "fr400 fr405 fr450 fr550"
     set cpu_option -mcpu

sim/testsuite/frv/fr500/allinsn.exp

@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550"
     set cpu_option -mcpu

sim/testsuite/frv/fr550/allinsn.exp

@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "fr550"
     set cpu_option -mcpu

sim/testsuite/frv/interrupts.exp

@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550 fr400"
     set cpu_option -mcpu

sim/testsuite/frv/misc.exp

@@ -1,10 +1,6 @@
 # Miscellaneous FRV simulator testcases.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550 fr400 fr405 fr450"
     set cpu_option -mcpu

sim/testsuite/frv/parallel.exp

@@ -1,10 +1,6 @@
 # FRV simulator testsuite.
 
 if [istarget frv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "frv"
-
     # all machines
     set all_machs "frv fr500 fr550 fr400"
     set cpu_option -mcpu

sim/testsuite/ft32/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/ft32/allinsn.exp

@@ -1,10 +1,6 @@
 # ft32 simulator testsuite
 
 if [istarget ft32-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "ft32"
-
     # all machines
     set all_machs "ft32"
 

sim/testsuite/h8300/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/h8300/allinsn.exp

@@ -1,10 +1,6 @@
 # Hitachi H8/300 (h, s, sx) simulator testsuite
 
 if {[istarget h8300*-*-*] || [istarget h8sx*-*-*]} then {
-    # Used to locate the `run` program.
-    global arch
-    set arch "h8300"
-
     set all_machs "h8300 h8300h h8300s h8sx"
 
     foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.s]] {

sim/testsuite/iq2000/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/iq2000/allinsn.exp

@@ -1,10 +1,6 @@
 # iq2000 simulator testsuite
 
 if [istarget iq2000-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "iq2000"
-
     # all machines
     set all_machs "iq2000"
 

sim/testsuite/lib/sim-defs.exp

@@ -48,6 +48,22 @@ proc sim_compile { source dest type options } {
     return $result
 }
 
+# Find the path to the simulator for executing.
+proc sim_tool_path {} {
+    global sim_path
+    set sim "$sim_path"
+    if [string equal "" $sim] {
+	global objdir
+	global subdir
+	set arch "$subdir"
+	while { [file dirname $arch] != "." } {
+	    set arch [file dirname $arch]
+	}
+	return "$objdir/$arch/run"
+    }
+    return "$sim"
+}
+
 # Run a program on the simulator.
 # Required by dejagnu (at least ${tool}_run used to be).
 #
@@ -98,16 +114,7 @@ proc sim_run { prog sim_opts prog_opts redir options } {
 	
     verbose "testcase timeout is set to $testcase_timeout" 1
 
-    set sim [board_info target sim]
+    set sim [sim_tool_path]
-    if [string equal "" $sim] {
-	# Special case the simulator.  These tests are designed to
-	# be run inside of the simulator, not on the native host.
-	# So if the sim target isn't set, default to the target run.
-	# These global variables come from generated site.exp.
-	global objdir
-	global arch
-	set sim "$objdir/$arch/run"
-    }
 
     if [is_remote host] {
 	set prog [remote_download host $prog]

sim/testsuite/lm32/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/lm32/allinsn.exp

@@ -1,10 +1,6 @@
 # lm32 simulator testsuite
 
 if [istarget lm32-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "lm32"
-
     # all machines
     set all_machs "lm32"
 

sim/testsuite/m32c/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/m32c/allinsn.exp

@@ -2,10 +2,6 @@
 # TODO: Add support for .c tests.
 
 if [istarget m32c*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m32c"
-
     # all machines
     set all_machs "m32c"
 

sim/testsuite/m32r/ChangeLog

@@ -1,3 +1,8 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+	* misc.exp: Likewise.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp, misc.exp: Define arch.

sim/testsuite/m32r/allinsn.exp

@@ -1,10 +1,6 @@
 # M32R simulator testsuite.
 
 if [istarget m32r*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m32r"
-
     # all machines
     set all_machs "m32r"
 

sim/testsuite/m32r/misc.exp

@@ -1,10 +1,6 @@
 # Miscellaneous M32R simulator testcases
 
 if [istarget m32r*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m32r"
-
     # all machines
     set all_machs "m32r"
 

sim/testsuite/m68hc11/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/m68hc11/allinsn.exp

@@ -1,10 +1,6 @@
 # m68hc11 simulator testsuite
 
 if [istarget m68hc11-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "m68hc11"
-
     # all machines
     set all_machs "m68hc11"
 

sim/testsuite/mcore/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/mcore/allinsn.exp

@@ -1,10 +1,6 @@
 # mcore simulator testsuite
 
 if [istarget mcore-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "mcore"
-
     # all machines
     set all_machs "mcore"
 

sim/testsuite/microblaze/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/microblaze/allinsn.exp

@@ -1,10 +1,6 @@
 # microblaze simulator testsuite
 
 if [istarget microblaze-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "microblaze"
-
     # all machines
     set all_machs "microblaze"
 

sim/testsuite/mips/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* basic.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* basic.exp: Define arch.

sim/testsuite/mips/basic.exp

@@ -42,10 +42,6 @@ proc run_sim_tests { name requested_machs { requested_micromips_machs "" } } {
 
 # Only test mips*-*-elf (e.g., no mips*-*-linux)
 if {[istarget mips*-*-elf]} {
-    # Used to locate the `run` program.
-    global arch
-    set arch "mips"
-
     set dspmodels ""
     set mdmxmodels ""
     set micromipsmodels ""

sim/testsuite/mn10300/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/mn10300/allinsn.exp

@@ -1,10 +1,6 @@
 # mn10300 simulator testsuite
 
 if [istarget mn10300-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "mn10300"
-
     # all machines
     set all_machs "mn10300"
 

sim/testsuite/moxie/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/moxie/allinsn.exp

@@ -1,10 +1,6 @@
 # moxie simulator testsuite
 
 if [istarget moxie-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "moxie"
-
     # all machines
     set all_machs "moxie"
 

sim/testsuite/msp430/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/msp430/allinsn.exp

@@ -1,10 +1,6 @@
 # msp430 simulator testsuite
 
 if [istarget msp430-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "msp430"
-
     # all machines
     set all_machs "msp430"
 

sim/testsuite/or1k/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* alltests.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* alltests.exp: Define arch.

sim/testsuite/or1k/alltests.exp

@@ -16,10 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if [istarget or1k*-*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "or1k"
-
     set all_machs "or1k"
 
     global global_ld_options

sim/testsuite/pru/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/pru/allinsn.exp

@@ -19,10 +19,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if [istarget pru-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "pru"
-
     # all machines
     set all_machs "pru"
 

sim/testsuite/riscv/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/riscv/allinsn.exp

@@ -1,10 +1,6 @@
 # RISC-V simulator testsuite.
 
 if [istarget riscv*-*] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "riscv"
-
     # all machines
     set all_machs "riscv"
 

sim/testsuite/sh/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsn.exp: Define arch.

sim/testsuite/sh/allinsn.exp

@@ -13,10 +13,6 @@ foreach opt $board_variant_list {
 }
 
 if [istarget sh-*elf] {
-    # Used to locate the `run` program.
-    global arch
-    set arch "sh"
-
     run_sim_test add.s    $all
     run_sim_test and.s    $all
     run_sim_test bandor.s sh

sim/testsuite/v850/ChangeLog

@@ -1,3 +1,7 @@
+2021-04-08  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsns.exp (arch): Delete.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>
 
 	* allinsns.exp: Define arch.

sim/testsuite/v850/allinsns.exp

@@ -3,10 +3,6 @@
 if [istarget v850*-*] {
     global opt
 
-    # Used to locate the `run` program.
-    global arch
-    set arch "v850"
-
     # all machines
     switch -regexp -- $opt {
 	.*v850e.* {