From 3df3af7c3f9095f9dc951fe680ce76f6e497914b Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sat, 23 Aug 2014 04:27:26 +0200 Subject: [PATCH] Fix iq2000-elf sim, default hardware to off. See nearby (previous) commit for the frv sim; this similarly fails at the dv_sockser_install declaration in sim/iq2000/tconfig.in. There's no HAVE_DV_SOCKSER conditionals here and no other dv-sockser.o artefacts so maybe there is no further fallout, but I'm going to disable sim-hardware just be consistent with the state before 94c63d78f (2013-03-23) and with the actions for the frv sim. Make check-sim for iq2000-elf shows no failures but that's in no small part because it has no test-suite. sim/iq2000: * configure.ac: Default simulator hardware to off again without emitting errors when off or dv-sockser.o unavailable. * configure: Regenerate. --- sim/iq2000/ChangeLog | 6 ++++++ sim/iq2000/configure | 10 ++-------- sim/iq2000/configure.ac | 8 +------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index bd076ca..dcb133f 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/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/iq2000/configure b/sim/iq2000/configure index e2d2704..626fbdd 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/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/iq2000/configure.ac b/sim/iq2000/configure.ac index 38e0690..dd26a18 100644 --- a/sim/iq2000/configure.ac +++ b/sim/iq2000/configure.ac @@ -14,12 +14,6 @@ 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