@@ -1,3 +1,7 @@
+2015-12-25 Mike Frysinger <vapier@gentoo.org>
+
+ * hw/rv-n-cris/rvc.exp (rvdummy): Set up sane default.
+
2012-03-24 Mike Frysinger <vapier@gentoo.org>
* c/clone5.c: Update output to ignore decoded signal string.
@@ -120,7 +120,16 @@ if [istarget cris*-*-*] {
set saved_global_sim_options $global_sim_options
set saved_global_ld_options $global_ld_options
- set rvdummy "[file dirname [board_info target sim]]/rvdummy"
+
+ # See the logic in sim-defs.exp for more details.
+ set sim [board_info target sim]
+ if [string equal "" $sim] {
+ global objdir
+ global arch
+ set rvdummy "$objdir/../$arch/rvdummy"
+ } else {
+ set rvdummy "[file dirname [board_info target sim]]/rvdummy"
+ }
# All machines we test and the corresponding assembler option.
# We'll only ever test v10 and higher here.