aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-11-27 01:22:30 -0500
committerMike Frysinger <vapier@gentoo.org>2021-11-27 01:26:41 -0500
commit8613fa4c49b7df547fbb89cc26667cd99e7cb2f5 (patch)
treefd4dc14f258a4eddba7669229ac93351d8b90f67 /sim
parent950065a38b317c32ffb0b9d4723a59d7faf95726 (diff)
downloadfsf-binutils-gdb-8613fa4c49b7df547fbb89cc26667cd99e7cb2f5.zip
fsf-binutils-gdb-8613fa4c49b7df547fbb89cc26667cd99e7cb2f5.tar.gz
fsf-binutils-gdb-8613fa4c49b7df547fbb89cc26667cd99e7cb2f5.tar.bz2
sim: cris: always search for local rvdummy tool
If the board info sets the sim to a basename that is found via $PATH (which is the default dejagnu behavior), the logic here to use its dirname to find rvdummy fails because it looks for `./rvdummy`. So switch it to always use the local build of rvdummy which is the one we want to be testing against in the first place. If we get a request for testing against a different setup, we can figure out & document the needs at that point, and then setup some config knobs to control it.
Diffstat (limited to 'sim')
-rw-r--r--sim/testsuite/cris/hw/rv-n-cris/rvc.exp10
1 files changed, 2 insertions, 8 deletions
diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
index 7c136db..905a2da 100644
--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@@ -122,14 +122,8 @@ if [istarget cris*-*-*] {
global SIMFLAGS_FOR_TARGET
set has_rv_and_cris [sim_has_rv_and_cris]
- # See the logic in sim-defs.exp for more details.
- set sim [board_info target sim]
- if [string equal "" $sim] {
- global builddir
- set rvdummy "$builddir/cris/rvdummy"
- } else {
- set rvdummy "[file dirname [board_info target sim]]/rvdummy"
- }
+ global builddir
+ set rvdummy "$builddir/cris/rvdummy"
# All machines we test and the corresponding assembler option.
# We'll only ever test v10 and higher here.