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.

diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index bd076caff3daceaf694d058e15c52d4ef33be7b2..dcb133f81a8bc7c9795081c96ad26ef7c65047bf 100644 (file)
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-23  Hans-Peter Nilsson  <hp@axis.com>
+
+       * 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  <amodra@gmail.com>
 
        * configure: Regenerate.

diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index e2d27047a6252ad0c00f84b5adbbe16791742935..626fbddbac83df136fbbe63e296e76c8867b4bb5 100755 (executable)
--- 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 38e0690916907fdf6a61e2c9fd45f0cb2e70ae4a..dd26a1804a88a6627e003c174fafa29a395f5448 100644 (file)
--- 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