From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 27 Nov 2021 06:22:30 +0000 (-0500)
Subject: sim: cris: always search for local rvdummy tool
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8613fa4c49b7df547fbb89cc26667cd99e7cb2f5;p=binutils-gdb.git

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.
---

diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
index 7c136db9530..905a2da92ec 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.