sim: testsuite: push $arch out to targets

This is needed to move to automake & its dejagnu-provided logic, and eventually by the unified sim logic. The $arch is used only to figure out which `run` program to use when running tests, and as we move to a single top-level build, we can delete this and use sim/run directly.
2021-01-15 23:23:46 -05:00 · 2021-01-15 23:23:46 -05:00 · b0dcd7d832
commit b0dcd7d832
parent 9ee455572d
73 changed files with 274 additions and 45 deletions
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@ -1,3 +1,8 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.tgt: Delete call to AC_SUBST(sim_arch).
+	* configure: Regenerate.
+
 2021-02-13  Mike Frysinger  <vapier@gentoo.org>

 	* README-HACKING: Replace sinclude with AC_CONFIG_MACRO_DIRS in
--- a/sim/configure
+++ b/sim/configure
@ -585,7 +585,6 @@ ac_unique_file="Makefile.in"
 enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-sim_arch
 subdirs
 CFLAGS_FOR_BUILD
 CC_FOR_BUILD
@ -4087,7 +4086,6 @@ subdirs="$subdirs aarch64"
       ;;
 esac

-
  if test "$sim_igen" = yes; then
    subdirs="$subdirs igen"

--- a/sim/configure.tgt
+++ b/sim/configure.tgt
@ -111,4 +111,3 @@ case "${target}" in
       sim_igen=yes
       ;;
 esac
-AC_SUBST(sim_arch)
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@ -1,3 +1,8 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in (arch): Delete.
+	(site.exp): Do not output $arch.
+
 2021-02-04  Mike Frysinger  <vapier@gentoo.org>

 	* riscv/: New directory.
--- a/sim/testsuite/Makefile.in
+++ b/sim/testsuite/Makefile.in
@ -29,8 +29,6 @@ target_canonical = @target@
 target_alias = @target_alias@
 program_transform_name = @program_transform_name@

-arch = @sim_arch@
-
 SHELL = /bin/sh
 SUBDIRS = @subdirs@
 RPATH_ENVVAR = @RPATH_ENVVAR@
@ -129,7 +127,6 @@ site.exp: Makefile
 	@echo '# edit the last section' >> $@-t
 	@echo 'set srcdir $(srcdir)' >> $@-t
 	@echo 'set objdir' `pwd` >> $@-t
-	@echo 'set arch $(arch)' >> $@-t
 	@echo 'set build_alias $(build_alias)' >> $@-t
 	@echo 'set build_triplet $(build_canonical)' >> $@-t
 	@echo 'set host_alias $(host_alias)' >> $@-t
--- a/sim/testsuite/aarch64/ChangeLog
+++ b/sim/testsuite/aarch64/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2017-04-22  Jim Wilson  <jim.wilson@linaro.org>

 	* fcvtz.s, fstur.s, ldn_single.s, ldnr.s, mla.s, mls.s, uzp.s: Align
--- a/sim/testsuite/aarch64/allinsn.exp
+++ b/sim/testsuite/aarch64/allinsn.exp
@ -1,6 +1,10 @@
 # AArch64 simulator testsuite

 if [istarget aarch64*-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "aarch64"
+
    # all machines
    set all_machs "aarch64"

--- a/sim/testsuite/arm/ChangeLog
+++ b/sim/testsuite/arm/ChangeLog
@ -1,3 +1,8 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp, iwmmxt/iwmmxt.exp, misc.exp, thumb/allthumb.ex,
+	xscale/xscale.exp: Define arch.
+
 2013-05-07  Jayant Sonar  <jayant.sonar@kpitcummins.com>
 	    Kaushik Phatak <Kaushik.Phatak@kpitcummins.com>

--- a/sim/testsuite/arm/allinsn.exp
+++ b/sim/testsuite/arm/allinsn.exp
@ -1,8 +1,9 @@
 # ARM simulator testsuite.

 if { [istarget arm*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "arm"

    # all machines
    set all_machs "xscale"
--- a/sim/testsuite/arm/iwmmxt/iwmmxt.exp
+++ b/sim/testsuite/arm/iwmmxt/iwmmxt.exp
@ -1,8 +1,9 @@
 # Intel(r) Wireless MMX(tm) technology simulator testsuite.

 if { [istarget arm*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "arm"

    # all machines
    set all_machs "xscale"
--- a/sim/testsuite/arm/misc.exp
+++ b/sim/testsuite/arm/misc.exp
@ -1,8 +1,9 @@
 # Miscellaneous ARM simulator testcases

 if { [istarget arm*-*-*] } {
-    # load support procs
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "arm"

    # all machines
    set all_machs "arm7tdmi"
--- a/sim/testsuite/arm/thumb/allthumb.exp
+++ b/sim/testsuite/arm/thumb/allthumb.exp
@ -1,8 +1,9 @@
 # ARM simulator testsuite.

 if { [istarget arm*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "arm"

    # all machines
    set all_machs "arm7tdmi"
--- a/sim/testsuite/arm/xscale/xscale.exp
+++ b/sim/testsuite/arm/xscale/xscale.exp
@ -1,8 +1,9 @@
 # XSCALE simulator testsuite.

 if { [istarget arm*-*-*] } {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "arm"

    # all machines
    set all_machs "xscale"
--- a/sim/testsuite/avr/ChangeLog
+++ b/sim/testsuite/avr/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-03-29  Mike Frysinger  <vapier@gentoo.org>

 	* testutils.inc (start): Change to _start and add global markings.
--- a/sim/testsuite/avr/allinsn.exp
+++ b/sim/testsuite/avr/allinsn.exp
@ -1,6 +1,10 @@
 # avr simulator testsuite

 if [istarget avr-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "avr"
+
    # all machines
    set all_machs "avr"

--- a/sim/testsuite/bfin/ChangeLog
+++ b/sim/testsuite/bfin/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2021-01-18  Mike Frysinger  <vapier@gentoo.org>

 	* s21.s: Delete accidental copyright line.
--- a/sim/testsuite/bfin/allinsn.exp
+++ b/sim/testsuite/bfin/allinsn.exp
@ -1,6 +1,10 @@
 # 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"

--- a/sim/testsuite/bpf/ChangeLog
+++ b/sim/testsuite/bpf/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2020-09-08  David Faust  <david.faust@oracle.com>

 	* alu.s: Correct div and mod tests.
--- a/sim/testsuite/bpf/allinsn.exp
+++ b/sim/testsuite/bpf/allinsn.exp
@ -1,6 +1,10 @@
 # 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"

--- a/sim/testsuite/cr16/ChangeLog
+++ b/sim/testsuite/cr16/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp, misc.exp: Define arch.
+
 2015-12-24  Mike Frysinger  <vapier@gentoo.org>

 	* allinsn.exp: Append --load-vma to global_sim_options.
--- a/sim/testsuite/cr16/allinsn.exp
+++ b/sim/testsuite/cr16/allinsn.exp
@ -1,8 +1,9 @@
 # CR16 simulator testsuite.

 if [istarget cr16*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "cr16"

    # all machines
    set all_machs "cr16"
--- a/sim/testsuite/cr16/misc.exp
+++ b/sim/testsuite/cr16/misc.exp
@ -1,8 +1,9 @@
 # Miscellaneous CR16 simulator testcases

 if [istarget cr16*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "cr16"

    # all machines
    set all_machs "cr16"
--- a/sim/testsuite/cris/ChangeLog
+++ b/sim/testsuite/cris/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* asm/asm.exp, c/c.exp, hw/rv-n-cris/rvc.exp: Define arch.
+
 2021-01-15  Mike Frysinger  <vapier@gentoo.org>

 	* c/c.exp: Change sim_run return to return_code.  Set status to
--- a/sim/testsuite/cris/asm/asm.exp
+++ b/sim/testsuite/cris/asm/asm.exp
@ -16,6 +16,10 @@
 # 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.
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@ -19,6 +19,10 @@ 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"
--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@ -112,6 +112,10 @@ 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
--- a/sim/testsuite/d10v/ChangeLog
+++ b/sim/testsuite/d10v/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2021-01-15  Mike Frysinger  <vapier@gentoo.org>

 	* allinsn.exp: New file.
@ -141,4 +145,3 @@ Mon Nov 10 19:21:26 1997  Andrew Cagney  <cagney@b1.cygnus.com>

 	* Makefile.in (RUN_FOR_TARGET): Look for simulator in d10v
 	directory.
-
--- a/sim/testsuite/d10v/allinsn.exp
+++ b/sim/testsuite/d10v/allinsn.exp
@ -1,8 +1,10 @@
 # d10v simulator testsuite.

 if [istarget d10v*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "d10v"
+
    # all machines
    set all_machs "d10v"

--- a/sim/testsuite/frv/ChangeLog
+++ b/sim/testsuite/frv/ChangeLog
@ -1,3 +1,9 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp, fr400/allinsn.exp, fr500/allinsn.exp,
+	fr550/allinsn.exp, interrupts.exp, misc.exp,
+	parallel.exp: Define arch.
+
 2021-01-15  Mike Frysinger  <vapier@gentoo.org>

 	* cache.ms: New testcase from ../../frv-elf/.
--- a/sim/testsuite/frv/allinsn.exp
+++ b/sim/testsuite/frv/allinsn.exp
@ -1,8 +1,10 @@
 # FRV simulator testsuite.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # 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
--- a/sim/testsuite/frv/fr400/allinsn.exp
+++ b/sim/testsuite/frv/fr400/allinsn.exp
@ -1,8 +1,10 @@
 # FRV simulator testsuite.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "frv"
+
    # all machines
    set all_machs "fr400 fr405 fr450 fr550"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/fr500/allinsn.exp
+++ b/sim/testsuite/frv/fr500/allinsn.exp
@ -1,8 +1,10 @@
 # FRV simulator testsuite.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "frv"
+
    # all machines
    set all_machs "frv fr500 fr550"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/fr550/allinsn.exp
+++ b/sim/testsuite/frv/fr550/allinsn.exp
@ -1,8 +1,10 @@
 # FRV simulator testsuite.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "frv"
+
    # all machines
    set all_machs "fr550"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/interrupts.exp
+++ b/sim/testsuite/frv/interrupts.exp
@ -1,8 +1,10 @@
 # FRV simulator testsuite.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "frv"
+
    # all machines
    set all_machs "frv fr500 fr550 fr400"
    set cpu_option -mcpu
--- a/sim/testsuite/frv/misc.exp
+++ b/sim/testsuite/frv/misc.exp
@ -1,8 +1,10 @@
 # Miscellaneous FRV simulator testcases.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # 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
--- a/sim/testsuite/frv/parallel.exp
+++ b/sim/testsuite/frv/parallel.exp
@ -1,8 +1,10 @@
 # FRV simulator testsuite.

 if [istarget frv*-*] {
-    # load support procs (none yet)
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "frv"
+
    # all machines
    set all_machs "frv fr500 fr550 fr400"
    set cpu_option -mcpu
--- a/sim/testsuite/ft32/ChangeLog
+++ b/sim/testsuite/ft32/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-10-12  James Bowman  <james.bowman@ftdichip.com>

 	* basic.s: Add test for memory size link parameters.
--- a/sim/testsuite/ft32/allinsn.exp
+++ b/sim/testsuite/ft32/allinsn.exp
@ -1,6 +1,10 @@
 # ft32 simulator testsuite

 if [istarget ft32-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "ft32"
+
    # all machines
    set all_machs "ft32"

--- a/sim/testsuite/h8300/ChangeLog
+++ b/sim/testsuite/h8300/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2021-01-05  Mike Frysinger  <vapier@gentoo.org>

 	* rotl.s (mach): Set to "h8300s h8sx".
--- a/sim/testsuite/h8300/allinsn.exp
+++ b/sim/testsuite/h8300/allinsn.exp
@ -1,6 +1,10 @@
 # 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]] {
--- a/sim/testsuite/iq2000/ChangeLog
+++ b/sim/testsuite/iq2000/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-04-05  Mike Frysinger  <vapier@gentoo.org>

 	* pass.s, allinsn.exp, testutils.inc: New files.
--- a/sim/testsuite/iq2000/allinsn.exp
+++ b/sim/testsuite/iq2000/allinsn.exp
@ -1,6 +1,10 @@
 # iq2000 simulator testsuite

 if [istarget iq2000-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "iq2000"
+
    # all machines
    set all_machs "iq2000"

--- a/sim/testsuite/lm32/ChangeLog
+++ b/sim/testsuite/lm32/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-04-05  Mike Frysinger  <vapier@gentoo.org>

 	* pass.s, allinsn.exp, testutils.inc: New files.
--- a/sim/testsuite/lm32/allinsn.exp
+++ b/sim/testsuite/lm32/allinsn.exp
@ -1,6 +1,10 @@
 # lm32 simulator testsuite

 if [istarget lm32-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "lm32"
+
    # all machines
    set all_machs "lm32"

--- a/sim/testsuite/m32c/ChangeLog
+++ b/sim/testsuite/m32c/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-11-14  Mike Frysinger  <vapier@gentoo.org>

 	* allinsn.exp: New file.
--- a/sim/testsuite/m32c/allinsn.exp
+++ b/sim/testsuite/m32c/allinsn.exp
@ -2,6 +2,10 @@
 # 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"

--- a/sim/testsuite/m32r/ChangeLog
+++ b/sim/testsuite/m32r/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp, misc.exp: Define arch.
+
 2021-01-15  Mike Frysinger  <vapier@gentoo.org>

 	* exit47.ms: New testcase from ../../m32r-elf/.
--- a/sim/testsuite/m32r/allinsn.exp
+++ b/sim/testsuite/m32r/allinsn.exp
@ -1,8 +1,9 @@
 # M32R simulator testsuite.

 if [istarget m32r*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "m32r"

    # all machines
    set all_machs "m32r"
--- a/sim/testsuite/m32r/misc.exp
+++ b/sim/testsuite/m32r/misc.exp
@ -1,8 +1,9 @@
 # Miscellaneous M32R simulator testcases

 if [istarget m32r*-*-*] {
-    # load support procs
-    # load_lib cgen.exp
+    # Used to locate the `run` program.
+    global arch
+    set arch "m32r"

    # all machines
    set all_machs "m32r"
--- a/sim/testsuite/m68hc11/ChangeLog
+++ b/sim/testsuite/m68hc11/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-04-05  Mike Frysinger  <vapier@gentoo.org>

 	* pass.s, allinsn.exp, testutils.inc: New files.
--- a/sim/testsuite/m68hc11/allinsn.exp
+++ b/sim/testsuite/m68hc11/allinsn.exp
@ -1,6 +1,10 @@
 # m68hc11 simulator testsuite

 if [istarget m68hc11-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "m68hc11"
+
    # all machines
    set all_machs "m68hc11"

--- a/sim/testsuite/mcore/ChangeLog
+++ b/sim/testsuite/mcore/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-11-15  Mike Frysinger  <vapier@gentoo.org>

 	* fail.s: New test.
--- a/sim/testsuite/mcore/allinsn.exp
+++ b/sim/testsuite/mcore/allinsn.exp
@ -1,6 +1,10 @@
 # mcore simulator testsuite

 if [istarget mcore-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "mcore"
+
    # all machines
    set all_machs "mcore"

--- a/sim/testsuite/microblaze/ChangeLog
+++ b/sim/testsuite/microblaze/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-03-29  Mike Frysinger  <vapier@gentoo.org>

 	* pass.s, allinsn.exp, testutils.inc: New files.
--- a/sim/testsuite/microblaze/allinsn.exp
+++ b/sim/testsuite/microblaze/allinsn.exp
@ -1,6 +1,10 @@
 # microblaze simulator testsuite

 if [istarget microblaze-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "microblaze"
+
    # all machines
    set all_machs "microblaze"

--- a/sim/testsuite/mips/ChangeLog
+++ b/sim/testsuite/mips/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* basic.exp: Define arch.
+
 2016-01-06  Joel Brobecker  <brobecker@adacore.com>

 	* hilo-hazard-4.s: Change copyright ownder to FSF.
--- a/sim/testsuite/mips/basic.exp
+++ b/sim/testsuite/mips/basic.exp
@ -42,6 +42,9 @@ 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 ""
--- a/sim/testsuite/mn10300/ChangeLog
+++ b/sim/testsuite/mn10300/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-04-05  Mike Frysinger  <vapier@gentoo.org>

 	* pass.s, allinsn.exp, testutils.inc: New files.
--- a/sim/testsuite/mn10300/allinsn.exp
+++ b/sim/testsuite/mn10300/allinsn.exp
@ -1,6 +1,10 @@
 # mn10300 simulator testsuite

 if [istarget mn10300-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "mn10300"
+
    # all machines
    set all_machs "mn10300"

--- a/sim/testsuite/moxie/ChangeLog
+++ b/sim/testsuite/moxie/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2015-04-05  Mike Frysinger  <vapier@gentoo.org>

 	* pass.s, allinsn.exp, testutils.inc: New files.
--- a/sim/testsuite/moxie/allinsn.exp
+++ b/sim/testsuite/moxie/allinsn.exp
@ -1,6 +1,10 @@
 # moxie simulator testsuite

 if [istarget moxie-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "moxie"
+
    # all machines
    set all_machs "moxie"

--- a/sim/testsuite/msp430/ChangeLog
+++ b/sim/testsuite/msp430/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2020-08-05  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

 	* mpyull_hwmult.s: New test.
--- a/sim/testsuite/msp430/allinsn.exp
+++ b/sim/testsuite/msp430/allinsn.exp
@ -1,6 +1,10 @@
 # msp430 simulator testsuite

 if [istarget msp430-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "msp430"
+
    # all machines
    set all_machs "msp430"

--- a/sim/testsuite/or1k/ChangeLog
+++ b/sim/testsuite/or1k/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* alltests.exp: Define arch.
+
 2019-06-13  Stafford Horne  <shorne@gmail.com>

 	* fpu-unordered.S: New file.
--- a/sim/testsuite/or1k/alltests.exp
+++ b/sim/testsuite/or1k/alltests.exp
@ -16,6 +16,9 @@
 # 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"

--- a/sim/testsuite/pru/ChangeLog
+++ b/sim/testsuite/pru/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2020-11-12  Dimitar Dimitrov  <dimitar@dinux.eu>

 	* lmbd.s: New test.
--- a/sim/testsuite/pru/allinsn.exp
+++ b/sim/testsuite/pru/allinsn.exp
@ -19,6 +19,10 @@
 # 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"

--- a/sim/testsuite/riscv/ChangeLog
+++ b/sim/testsuite/riscv/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2021-02-04  Mike Frysinger  <vapier@gentoo.org>

 	* allinsn.exp, pass.s, testutils.inc: New files.
--- a/sim/testsuite/riscv/allinsn.exp
+++ b/sim/testsuite/riscv/allinsn.exp
@ -1,6 +1,10 @@
 # RISC-V simulator testsuite.

 if [istarget riscv*-*] {
+    # Used to locate the `run` program.
+    global arch
+    set arch "riscv"
+
    # all machines
    set all_machs "riscv"

--- a/sim/testsuite/sh/ChangeLog
+++ b/sim/testsuite/sh/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsn.exp: Define arch.
+
 2004-09-13  DJ Delorie  <dj@redhat.com>

 	* sim/sh/allinsn.exp: Set global_as_options and
--- a/sim/testsuite/sh/allinsn.exp
+++ b/sim/testsuite/sh/allinsn.exp
@ -13,6 +13,10 @@ 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
--- a/sim/testsuite/v850/ChangeLog
+++ b/sim/testsuite/v850/ChangeLog
@ -1,3 +1,7 @@
+2021-02-13  Mike Frysinger  <vapier@gentoo.org>
+
+	* allinsns.exp: Define arch.
+
 2008-02-05  DJ Delorie  <dj@redhat.com>

 	* .: New directory.
--- a/sim/testsuite/v850/allinsns.exp
+++ b/sim/testsuite/v850/allinsns.exp
@ -3,10 +3,11 @@
 if [istarget v850*-*] {
    global opt

-    # load support procs (none yet)
-    # load_lib cgen.exp
-    # all machines
+    # Used to locate the `run` program.
+    global arch
+    set arch "v850"

+    # all machines
    switch -regexp -- $opt {
 	.*v850e.* {
 	    set all_machs "v850e"
@ -36,4 +37,3 @@ if [istarget v850*-*] {
 #    }
 #    puts [format "%-30s %s" $var "[set ::$var]"]
 #}
-