From b0dcd7d832e33240a9c8c1ed3d8d4636acfd8c4f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 15 Jan 2021 23:23:46 -0500 Subject: [PATCH] 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. --- sim/ChangeLog | 5 +++++ sim/configure | 2 -- sim/configure.tgt | 1 - sim/testsuite/ChangeLog | 5 +++++ sim/testsuite/Makefile.in | 3 --- sim/testsuite/aarch64/ChangeLog | 4 ++++ sim/testsuite/aarch64/allinsn.exp | 4 ++++ sim/testsuite/arm/ChangeLog | 5 +++++ sim/testsuite/arm/allinsn.exp | 5 +++-- sim/testsuite/arm/iwmmxt/iwmmxt.exp | 5 +++-- sim/testsuite/arm/misc.exp | 5 +++-- sim/testsuite/arm/thumb/allthumb.exp | 5 +++-- sim/testsuite/arm/xscale/xscale.exp | 5 +++-- sim/testsuite/avr/ChangeLog | 4 ++++ sim/testsuite/avr/allinsn.exp | 4 ++++ sim/testsuite/bfin/ChangeLog | 4 ++++ sim/testsuite/bfin/allinsn.exp | 4 ++++ sim/testsuite/bpf/ChangeLog | 4 ++++ sim/testsuite/bpf/allinsn.exp | 4 ++++ sim/testsuite/cr16/ChangeLog | 4 ++++ sim/testsuite/cr16/allinsn.exp | 5 +++-- sim/testsuite/cr16/misc.exp | 5 +++-- sim/testsuite/cris/ChangeLog | 4 ++++ sim/testsuite/cris/asm/asm.exp | 4 ++++ sim/testsuite/cris/c/c.exp | 4 ++++ sim/testsuite/cris/hw/rv-n-cris/rvc.exp | 4 ++++ sim/testsuite/d10v/ChangeLog | 5 ++++- sim/testsuite/d10v/allinsn.exp | 6 ++++-- sim/testsuite/frv/ChangeLog | 6 ++++++ sim/testsuite/frv/allinsn.exp | 6 ++++-- sim/testsuite/frv/fr400/allinsn.exp | 6 ++++-- sim/testsuite/frv/fr500/allinsn.exp | 6 ++++-- sim/testsuite/frv/fr550/allinsn.exp | 6 ++++-- sim/testsuite/frv/interrupts.exp | 6 ++++-- sim/testsuite/frv/misc.exp | 6 ++++-- sim/testsuite/frv/parallel.exp | 6 ++++-- sim/testsuite/ft32/ChangeLog | 4 ++++ sim/testsuite/ft32/allinsn.exp | 4 ++++ sim/testsuite/h8300/ChangeLog | 4 ++++ sim/testsuite/h8300/allinsn.exp | 4 ++++ sim/testsuite/iq2000/ChangeLog | 4 ++++ sim/testsuite/iq2000/allinsn.exp | 4 ++++ sim/testsuite/lm32/ChangeLog | 4 ++++ sim/testsuite/lm32/allinsn.exp | 4 ++++ sim/testsuite/m32c/ChangeLog | 4 ++++ sim/testsuite/m32c/allinsn.exp | 4 ++++ sim/testsuite/m32r/ChangeLog | 4 ++++ sim/testsuite/m32r/allinsn.exp | 5 +++-- sim/testsuite/m32r/misc.exp | 5 +++-- sim/testsuite/m68hc11/ChangeLog | 4 ++++ sim/testsuite/m68hc11/allinsn.exp | 4 ++++ sim/testsuite/mcore/ChangeLog | 4 ++++ sim/testsuite/mcore/allinsn.exp | 4 ++++ sim/testsuite/microblaze/ChangeLog | 4 ++++ sim/testsuite/microblaze/allinsn.exp | 4 ++++ sim/testsuite/mips/ChangeLog | 4 ++++ sim/testsuite/mips/basic.exp | 3 +++ sim/testsuite/mn10300/ChangeLog | 4 ++++ sim/testsuite/mn10300/allinsn.exp | 4 ++++ sim/testsuite/moxie/ChangeLog | 4 ++++ sim/testsuite/moxie/allinsn.exp | 4 ++++ sim/testsuite/msp430/ChangeLog | 4 ++++ sim/testsuite/msp430/allinsn.exp | 4 ++++ sim/testsuite/or1k/ChangeLog | 4 ++++ sim/testsuite/or1k/alltests.exp | 3 +++ sim/testsuite/pru/ChangeLog | 4 ++++ sim/testsuite/pru/allinsn.exp | 4 ++++ sim/testsuite/riscv/ChangeLog | 4 ++++ sim/testsuite/riscv/allinsn.exp | 4 ++++ sim/testsuite/sh/ChangeLog | 4 ++++ sim/testsuite/sh/allinsn.exp | 4 ++++ sim/testsuite/v850/ChangeLog | 4 ++++ sim/testsuite/v850/allinsns.exp | 8 ++++---- 73 files changed, 274 insertions(+), 45 deletions(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index 62dce248ecd..df11c5eeadd 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,8 @@ +2021-02-13 Mike Frysinger + + * configure.tgt: Delete call to AC_SUBST(sim_arch). + * configure: Regenerate. + 2021-02-13 Mike Frysinger * README-HACKING: Replace sinclude with AC_CONFIG_MACRO_DIRS in diff --git a/sim/configure b/sim/configure index 5a6298199e7..a7747268d3b 100755 --- 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" diff --git a/sim/configure.tgt b/sim/configure.tgt index 5f201060f1c..e5acc797316 100644 --- a/sim/configure.tgt +++ b/sim/configure.tgt @@ -111,4 +111,3 @@ case "${target}" in sim_igen=yes ;; esac -AC_SUBST(sim_arch) diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog index 3b2b8df8ffe..9eadd5fc400 100644 --- a/sim/testsuite/ChangeLog +++ b/sim/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2021-02-13 Mike Frysinger + + * Makefile.in (arch): Delete. + (site.exp): Do not output $arch. + 2021-02-04 Mike Frysinger * riscv/: New directory. diff --git a/sim/testsuite/Makefile.in b/sim/testsuite/Makefile.in index 1e4604cea68..8db77d2d46f 100644 --- 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 diff --git a/sim/testsuite/aarch64/ChangeLog b/sim/testsuite/aarch64/ChangeLog index f4671da3563..29378ce49ca 100644 --- a/sim/testsuite/aarch64/ChangeLog +++ b/sim/testsuite/aarch64/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2017-04-22 Jim Wilson * fcvtz.s, fstur.s, ldn_single.s, ldnr.s, mla.s, mls.s, uzp.s: Align diff --git a/sim/testsuite/aarch64/allinsn.exp b/sim/testsuite/aarch64/allinsn.exp index 54d64784c23..04a234f5357 100644 --- 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" diff --git a/sim/testsuite/arm/ChangeLog b/sim/testsuite/arm/ChangeLog index 1237d81fe67..a1e80feb607 100644 --- a/sim/testsuite/arm/ChangeLog +++ b/sim/testsuite/arm/ChangeLog @@ -1,3 +1,8 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp, iwmmxt/iwmmxt.exp, misc.exp, thumb/allthumb.ex, + xscale/xscale.exp: Define arch. + 2013-05-07 Jayant Sonar Kaushik Phatak diff --git a/sim/testsuite/arm/allinsn.exp b/sim/testsuite/arm/allinsn.exp index 9752da615ac..89ff9659479 100644 --- 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" diff --git a/sim/testsuite/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/arm/iwmmxt/iwmmxt.exp index 4def69031a9..9710f3670ba 100644 --- 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" diff --git a/sim/testsuite/arm/misc.exp b/sim/testsuite/arm/misc.exp index bc36ca87368..ea6fd3c3c9a 100644 --- 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" diff --git a/sim/testsuite/arm/thumb/allthumb.exp b/sim/testsuite/arm/thumb/allthumb.exp index 4298663fd81..eca5fa18c71 100644 --- 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" diff --git a/sim/testsuite/arm/xscale/xscale.exp b/sim/testsuite/arm/xscale/xscale.exp index 7c08f11d10d..20c9df80351 100644 --- 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" diff --git a/sim/testsuite/avr/ChangeLog b/sim/testsuite/avr/ChangeLog index 8c1bde26b98..8ee57d29d13 100644 --- a/sim/testsuite/avr/ChangeLog +++ b/sim/testsuite/avr/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-03-29 Mike Frysinger * testutils.inc (start): Change to _start and add global markings. diff --git a/sim/testsuite/avr/allinsn.exp b/sim/testsuite/avr/allinsn.exp index 584a93da930..a5c16b629b7 100644 --- 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" diff --git a/sim/testsuite/bfin/ChangeLog b/sim/testsuite/bfin/ChangeLog index d4432cda1ad..ff7f639922e 100644 --- a/sim/testsuite/bfin/ChangeLog +++ b/sim/testsuite/bfin/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2021-01-18 Mike Frysinger * s21.s: Delete accidental copyright line. diff --git a/sim/testsuite/bfin/allinsn.exp b/sim/testsuite/bfin/allinsn.exp index aa304eaa9b4..3d3378171c6 100644 --- 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" diff --git a/sim/testsuite/bpf/ChangeLog b/sim/testsuite/bpf/ChangeLog index 17dd79b468a..76d54e1369d 100644 --- a/sim/testsuite/bpf/ChangeLog +++ b/sim/testsuite/bpf/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2020-09-08 David Faust * alu.s: Correct div and mod tests. diff --git a/sim/testsuite/bpf/allinsn.exp b/sim/testsuite/bpf/allinsn.exp index 2cca77021af..ffffd8a6892 100644 --- 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" diff --git a/sim/testsuite/cr16/ChangeLog b/sim/testsuite/cr16/ChangeLog index 4cb008b68ab..b241c860949 100644 --- a/sim/testsuite/cr16/ChangeLog +++ b/sim/testsuite/cr16/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp, misc.exp: Define arch. + 2015-12-24 Mike Frysinger * allinsn.exp: Append --load-vma to global_sim_options. diff --git a/sim/testsuite/cr16/allinsn.exp b/sim/testsuite/cr16/allinsn.exp index 852a673c360..1b6847c7815 100644 --- 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" diff --git a/sim/testsuite/cr16/misc.exp b/sim/testsuite/cr16/misc.exp index 39dd3a4caa3..67fa4c2d7d3 100644 --- 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" diff --git a/sim/testsuite/cris/ChangeLog b/sim/testsuite/cris/ChangeLog index 16c7c27ad4f..d780e2c1d31 100644 --- a/sim/testsuite/cris/ChangeLog +++ b/sim/testsuite/cris/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * asm/asm.exp, c/c.exp, hw/rv-n-cris/rvc.exp: Define arch. + 2021-01-15 Mike Frysinger * c/c.exp: Change sim_run return to return_code. Set status to diff --git a/sim/testsuite/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp index 415bbf1082a..b8c14c8d05c 100644 --- 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. diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp index 08ea18812ec..3d493b7c144 100644 --- 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" diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp index 0f9ecec32a2..0a018fa4b88 100644 --- 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 diff --git a/sim/testsuite/d10v/ChangeLog b/sim/testsuite/d10v/ChangeLog index 5ca891021e6..d04d884513c 100644 --- a/sim/testsuite/d10v/ChangeLog +++ b/sim/testsuite/d10v/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2021-01-15 Mike Frysinger * allinsn.exp: New file. @@ -141,4 +145,3 @@ Mon Nov 10 19:21:26 1997 Andrew Cagney * Makefile.in (RUN_FOR_TARGET): Look for simulator in d10v directory. - diff --git a/sim/testsuite/d10v/allinsn.exp b/sim/testsuite/d10v/allinsn.exp index 123509a3b99..e2e44a29092 100644 --- 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" diff --git a/sim/testsuite/frv/ChangeLog b/sim/testsuite/frv/ChangeLog index 66f027e4465..7a34cf456f7 100644 --- a/sim/testsuite/frv/ChangeLog +++ b/sim/testsuite/frv/ChangeLog @@ -1,3 +1,9 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp, fr400/allinsn.exp, fr500/allinsn.exp, + fr550/allinsn.exp, interrupts.exp, misc.exp, + parallel.exp: Define arch. + 2021-01-15 Mike Frysinger * cache.ms: New testcase from ../../frv-elf/. diff --git a/sim/testsuite/frv/allinsn.exp b/sim/testsuite/frv/allinsn.exp index b7f9fe2ad06..2633f30df56 100644 --- 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 diff --git a/sim/testsuite/frv/fr400/allinsn.exp b/sim/testsuite/frv/fr400/allinsn.exp index b1697610403..ea5846f8fa4 100644 --- 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 diff --git a/sim/testsuite/frv/fr500/allinsn.exp b/sim/testsuite/frv/fr500/allinsn.exp index 7d192593efb..40caa630706 100644 --- 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 diff --git a/sim/testsuite/frv/fr550/allinsn.exp b/sim/testsuite/frv/fr550/allinsn.exp index 1fe17952de1..8768a671994 100644 --- 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 diff --git a/sim/testsuite/frv/interrupts.exp b/sim/testsuite/frv/interrupts.exp index e31533e1053..d1f7628d962 100644 --- 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 diff --git a/sim/testsuite/frv/misc.exp b/sim/testsuite/frv/misc.exp index 4245a81cb60..d9c80a54600 100644 --- 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 diff --git a/sim/testsuite/frv/parallel.exp b/sim/testsuite/frv/parallel.exp index 8101a67afb5..a883b9891d5 100644 --- 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 diff --git a/sim/testsuite/ft32/ChangeLog b/sim/testsuite/ft32/ChangeLog index cb1d2f4f895..d7aba74aac2 100644 --- a/sim/testsuite/ft32/ChangeLog +++ b/sim/testsuite/ft32/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-10-12 James Bowman * basic.s: Add test for memory size link parameters. diff --git a/sim/testsuite/ft32/allinsn.exp b/sim/testsuite/ft32/allinsn.exp index 730b4223632..50827a59247 100644 --- 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" diff --git a/sim/testsuite/h8300/ChangeLog b/sim/testsuite/h8300/ChangeLog index 82128cc43ad..98020b806dc 100644 --- a/sim/testsuite/h8300/ChangeLog +++ b/sim/testsuite/h8300/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2021-01-05 Mike Frysinger * rotl.s (mach): Set to "h8300s h8sx". diff --git a/sim/testsuite/h8300/allinsn.exp b/sim/testsuite/h8300/allinsn.exp index 68468f6bb10..5355bf58a69 100644 --- 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]] { diff --git a/sim/testsuite/iq2000/ChangeLog b/sim/testsuite/iq2000/ChangeLog index d3f8b9dffcf..8eb2490bb4d 100644 --- a/sim/testsuite/iq2000/ChangeLog +++ b/sim/testsuite/iq2000/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-04-05 Mike Frysinger * pass.s, allinsn.exp, testutils.inc: New files. diff --git a/sim/testsuite/iq2000/allinsn.exp b/sim/testsuite/iq2000/allinsn.exp index 38eee9b277f..96d58435fb4 100644 --- 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" diff --git a/sim/testsuite/lm32/ChangeLog b/sim/testsuite/lm32/ChangeLog index d3f8b9dffcf..8eb2490bb4d 100644 --- a/sim/testsuite/lm32/ChangeLog +++ b/sim/testsuite/lm32/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-04-05 Mike Frysinger * pass.s, allinsn.exp, testutils.inc: New files. diff --git a/sim/testsuite/lm32/allinsn.exp b/sim/testsuite/lm32/allinsn.exp index 61744985f6c..ae7c141bd64 100644 --- 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" diff --git a/sim/testsuite/m32c/ChangeLog b/sim/testsuite/m32c/ChangeLog index 84379196561..ce68cc35d45 100644 --- a/sim/testsuite/m32c/ChangeLog +++ b/sim/testsuite/m32c/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-11-14 Mike Frysinger * allinsn.exp: New file. diff --git a/sim/testsuite/m32c/allinsn.exp b/sim/testsuite/m32c/allinsn.exp index fb5ccca282e..b09b505972a 100644 --- 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" diff --git a/sim/testsuite/m32r/ChangeLog b/sim/testsuite/m32r/ChangeLog index 3e6dbf713a3..e855c1a4804 100644 --- a/sim/testsuite/m32r/ChangeLog +++ b/sim/testsuite/m32r/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp, misc.exp: Define arch. + 2021-01-15 Mike Frysinger * exit47.ms: New testcase from ../../m32r-elf/. diff --git a/sim/testsuite/m32r/allinsn.exp b/sim/testsuite/m32r/allinsn.exp index 8eed80f91d6..a800e78b1b4 100644 --- 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" diff --git a/sim/testsuite/m32r/misc.exp b/sim/testsuite/m32r/misc.exp index 6ed5638ab29..e571c2eeb69 100644 --- 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" diff --git a/sim/testsuite/m68hc11/ChangeLog b/sim/testsuite/m68hc11/ChangeLog index d3f8b9dffcf..8eb2490bb4d 100644 --- a/sim/testsuite/m68hc11/ChangeLog +++ b/sim/testsuite/m68hc11/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-04-05 Mike Frysinger * pass.s, allinsn.exp, testutils.inc: New files. diff --git a/sim/testsuite/m68hc11/allinsn.exp b/sim/testsuite/m68hc11/allinsn.exp index db0cbd5d467..0e9b51ec593 100644 --- 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" diff --git a/sim/testsuite/mcore/ChangeLog b/sim/testsuite/mcore/ChangeLog index b0e79088ae6..18a2292c2f0 100644 --- a/sim/testsuite/mcore/ChangeLog +++ b/sim/testsuite/mcore/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-11-15 Mike Frysinger * fail.s: New test. diff --git a/sim/testsuite/mcore/allinsn.exp b/sim/testsuite/mcore/allinsn.exp index 5921cfc2643..ecc934b2014 100644 --- 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" diff --git a/sim/testsuite/microblaze/ChangeLog b/sim/testsuite/microblaze/ChangeLog index 2aa1f2cd791..5808b63ab60 100644 --- a/sim/testsuite/microblaze/ChangeLog +++ b/sim/testsuite/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-03-29 Mike Frysinger * pass.s, allinsn.exp, testutils.inc: New files. diff --git a/sim/testsuite/microblaze/allinsn.exp b/sim/testsuite/microblaze/allinsn.exp index f756914292c..5f5a4475eed 100644 --- 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" diff --git a/sim/testsuite/mips/ChangeLog b/sim/testsuite/mips/ChangeLog index ea954414193..feedcd36c9b 100644 --- a/sim/testsuite/mips/ChangeLog +++ b/sim/testsuite/mips/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * basic.exp: Define arch. + 2016-01-06 Joel Brobecker * hilo-hazard-4.s: Change copyright ownder to FSF. diff --git a/sim/testsuite/mips/basic.exp b/sim/testsuite/mips/basic.exp index f810741dbb7..2eff923c0fc 100644 --- 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 "" diff --git a/sim/testsuite/mn10300/ChangeLog b/sim/testsuite/mn10300/ChangeLog index d3f8b9dffcf..8eb2490bb4d 100644 --- a/sim/testsuite/mn10300/ChangeLog +++ b/sim/testsuite/mn10300/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-04-05 Mike Frysinger * pass.s, allinsn.exp, testutils.inc: New files. diff --git a/sim/testsuite/mn10300/allinsn.exp b/sim/testsuite/mn10300/allinsn.exp index f8431e7222e..7166aefddf3 100644 --- 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" diff --git a/sim/testsuite/moxie/ChangeLog b/sim/testsuite/moxie/ChangeLog index d3f8b9dffcf..8eb2490bb4d 100644 --- a/sim/testsuite/moxie/ChangeLog +++ b/sim/testsuite/moxie/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2015-04-05 Mike Frysinger * pass.s, allinsn.exp, testutils.inc: New files. diff --git a/sim/testsuite/moxie/allinsn.exp b/sim/testsuite/moxie/allinsn.exp index 1a6af8b37d4..241e6757625 100644 --- 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" diff --git a/sim/testsuite/msp430/ChangeLog b/sim/testsuite/msp430/ChangeLog index cd6b1952adc..df36ad6e5dc 100644 --- a/sim/testsuite/msp430/ChangeLog +++ b/sim/testsuite/msp430/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2020-08-05 Jozef Lawrynowicz * mpyull_hwmult.s: New test. diff --git a/sim/testsuite/msp430/allinsn.exp b/sim/testsuite/msp430/allinsn.exp index affa8aedc2a..83030290cce 100644 --- 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" diff --git a/sim/testsuite/or1k/ChangeLog b/sim/testsuite/or1k/ChangeLog index f5623809b9d..f4bc2e1f263 100644 --- a/sim/testsuite/or1k/ChangeLog +++ b/sim/testsuite/or1k/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * alltests.exp: Define arch. + 2019-06-13 Stafford Horne * fpu-unordered.S: New file. diff --git a/sim/testsuite/or1k/alltests.exp b/sim/testsuite/or1k/alltests.exp index dd08fbcf99b..98c1345d0be 100644 --- a/sim/testsuite/or1k/alltests.exp +++ b/sim/testsuite/or1k/alltests.exp @@ -16,6 +16,9 @@ # along with this program. If not, see . if [istarget or1k*-*-*] { + # Used to locate the `run` program. + global arch + set arch "or1k" set all_machs "or1k" diff --git a/sim/testsuite/pru/ChangeLog b/sim/testsuite/pru/ChangeLog index 3d862d13da2..c6a0af5f026 100644 --- a/sim/testsuite/pru/ChangeLog +++ b/sim/testsuite/pru/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2020-11-12 Dimitar Dimitrov * lmbd.s: New test. diff --git a/sim/testsuite/pru/allinsn.exp b/sim/testsuite/pru/allinsn.exp index d147f731c91..c0d5ce93689 100644 --- a/sim/testsuite/pru/allinsn.exp +++ b/sim/testsuite/pru/allinsn.exp @@ -19,6 +19,10 @@ # along with this program. If not, see . if [istarget pru-*] { + # Used to locate the `run` program. + global arch + set arch "pru" + # all machines set all_machs "pru" diff --git a/sim/testsuite/riscv/ChangeLog b/sim/testsuite/riscv/ChangeLog index c222209850e..f982ea85b61 100644 --- a/sim/testsuite/riscv/ChangeLog +++ b/sim/testsuite/riscv/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2021-02-04 Mike Frysinger * allinsn.exp, pass.s, testutils.inc: New files. diff --git a/sim/testsuite/riscv/allinsn.exp b/sim/testsuite/riscv/allinsn.exp index 03bec1b541e..5701391da83 100644 --- 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" diff --git a/sim/testsuite/sh/ChangeLog b/sim/testsuite/sh/ChangeLog index e3852f9eb91..3351f5f932d 100644 --- a/sim/testsuite/sh/ChangeLog +++ b/sim/testsuite/sh/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsn.exp: Define arch. + 2004-09-13 DJ Delorie * sim/sh/allinsn.exp: Set global_as_options and diff --git a/sim/testsuite/sh/allinsn.exp b/sim/testsuite/sh/allinsn.exp index 40d13929942..235a40c692a 100644 --- 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 diff --git a/sim/testsuite/v850/ChangeLog b/sim/testsuite/v850/ChangeLog index 2508dfd96ee..24933c53a97 100644 --- a/sim/testsuite/v850/ChangeLog +++ b/sim/testsuite/v850/ChangeLog @@ -1,3 +1,7 @@ +2021-02-13 Mike Frysinger + + * allinsns.exp: Define arch. + 2008-02-05 DJ Delorie * .: New directory. diff --git a/sim/testsuite/v850/allinsns.exp b/sim/testsuite/v850/allinsns.exp index f60c3d66aa4..4c3bc088ff6 100644 --- 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]"] #} - \ No newline at end of file -- 2.30.2