From c4892a6b37647a0b33a2113b59762f678aabe4b2 Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sat, 23 Aug 2014 04:40:36 +0200 Subject: [PATCH] Fix sh64-elf sim, default hardware to off. See nearby (previous) commit for the iq2000 sim; this similarly fails at the dv_sockser_install declaration in sim/sh64/tconfig.in. I'm disabling simulator hardware to be consistent with the state before 94c63d78f (2013-03-23) and with the actions for the frv sim and the iq2000 sim. Make check-sim for sh64-elf shows no regressions (25 failures; 357 expected passes) compared to bf3d9781ec049 (before the recent config.in regen, after sim-hardware mostly-enabled) and eed23bb4a1 (before the sim-hardware mostly-enabled; 2013-03-23). sim/sh64: * configure.ac: Default simulator hardware to off again without emitting errors when off or dv-sockser.o unavailable. * configure: Regenerate. --- sim/sh64/ChangeLog | 6 ++++++ sim/sh64/configure | 10 ++-------- sim/sh64/configure.ac | 8 +------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog index 4fbe8a3..05d0329 100644 --- a/sim/sh64/ChangeLog +++ b/sim/sh64/ChangeLog @@ -1,3 +1,9 @@ +2014-08-23 Hans-Peter Nilsson + + * configure.ac: Default simulator hardware to off again + without emitting errors when off or dv-sockser.o unavailable. + * configure: Regenerate. + 2014-08-19 Alan Modra * configure: Regenerate. diff --git a/sim/sh64/configure b/sim/sh64/configure index 578b567..18f98fb 100755 --- a/sim/sh64/configure +++ b/sim/sh64/configure @@ -13445,7 +13445,7 @@ fi -if test x"always" != x"no"; then +if test x"no" != x"no"; then enable_sim_hardware=yes else enable_sim_hardware=no @@ -13476,7 +13476,7 @@ case ${enable_sim_hardware} in esac if test "$sim_hw_p" != yes; then - if test "always" = "always"; then + if test "no" = "always"; then as_fn_error "Sorry, but this simulator requires that hardware support be enabled. Please configure without --disable-hw-support." "$LINENO" 5 fi @@ -13560,12 +13560,6 @@ fi fi -if test -z "$SIM_DV_SOCKSER_O"; then - as_fn_error "Sorry, but hardware support in this simulator -unconditionally relies on dv-sockser.o which is unavailable for your host. -Please fix this simulator." "$LINENO" 5 -fi - ac_sources="$sim_link_files" ac_dests="$sim_link_links" diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac index 1ce3e75..b0a875d 100644 --- a/sim/sh64/configure.ac +++ b/sim/sh64/configure.ac @@ -14,13 +14,7 @@ SIM_AC_OPTION_ENVIRONMENT SIM_AC_OPTION_INLINE() SIM_AC_OPTION_CGEN_MAINT -SIM_AC_OPTION_HARDWARE(always,"","") - -if test -z "$SIM_DV_SOCKSER_O"; then - AC_MSG_ERROR([Sorry, but hardware support in this simulator -unconditionally relies on dv-sockser.o which is unavailable for your host. -Please fix this simulator.]) -fi +SIM_AC_OPTION_HARDWARE(no,"","") SIM_AC_OUTPUT -- 2.7.4