diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-04-04 09:01:09 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-04-08 00:45:07 -0400 |
| commit | 23cb7bac66bf6a24e71390ce7ead5d327ae85439 (patch) | |
| tree | feb5cb1d9c3ddb72b94c41cf32492a5af95dab39 /sim/testsuite/cris | |
| parent | 0592e80bcf1bbab2fbbb110ea395f9608e4f594c (diff) | |
| download | binutils-gdb-23cb7bac66bf6a24e71390ce7ead5d327ae85439.tar.gz | |
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.
Diffstat (limited to 'sim/testsuite/cris')
| -rw-r--r-- | sim/testsuite/cris/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/testsuite/cris/asm/asm.exp | 4 | ||||
| -rw-r--r-- | sim/testsuite/cris/c/c.exp | 4 | ||||
| -rw-r--r-- | sim/testsuite/cris/hw/rv-n-cris/rvc.exp | 7 |
4 files changed, 6 insertions, 14 deletions
diff --git a/sim/testsuite/cris/ChangeLog b/sim/testsuite/cris/ChangeLog index d780e2c1d31..121b6f32617 100644 --- a/sim/testsuite/cris/ChangeLog +++ b/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. diff --git a/sim/testsuite/cris/asm/asm.exp b/sim/testsuite/cris/asm/asm.exp index b8c14c8d05c..415bbf1082a 100644 --- a/sim/testsuite/cris/asm/asm.exp +++ b/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. diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp index 3d493b7c144..08ea18812ec 100644 --- a/sim/testsuite/cris/c/c.exp +++ b/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" diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp index 0a018fa4b88..4e302d2238f 100644 --- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp +++ b/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/../$arch/rvdummy" + set rvdummy "$objdir/cris/rvdummy" } else { set rvdummy "[file dirname [board_info target sim]]/rvdummy" } |