sim: frv/m32r: back out hard failure when dv-sockser is not available
These sims have optional support for the dv-sockser model, so do not make
them hard failures. The Makefile made it seem like they didn't actually
support things dynamically, but a further code dive into the source and
the Makefile shows that things work out.
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 820c17f..9e995bc 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,11 @@
+2013-03-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+ Mike Frysinger <vapier@gentoo.org>
+
+ * configure.ac: Add frv_extra_objs. Change simulator hardware
+ from always on to defaulting to yes it is enabled.
+ * Makefile.in: Conditionalize reference to dv-sockser.o.
+ * configure: Regenerated.
+
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 8960319..a0a17e8 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -19,9 +19,6 @@
FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o
-CONFIG_DEVICES = dv-sockser.o
-CONFIG_DEVICES =
-
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \
@@ -36,7 +33,7 @@
traps.o interrupts.o memory.o cache.o pipeline.o \
profile.o profile-fr400.o profile-fr450.o profile-fr500.o profile-fr550.o options.o \
devices.o reset.o registers.o \
- $(CONFIG_DEVICES)
+ $(frv_extra_objs)
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \
diff --git a/sim/frv/configure b/sim/frv/configure
index aa41286..c42dfd7 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -601,6 +601,7 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
+frv_extra_objs
SIM_DV_SOCKSER_O
sim_trapdump
cgen
@@ -12278,7 +12279,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12281 "configure"
+#line 12282 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12384,7 +12385,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12387 "configure"
+#line 12388 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13428,12 +13429,8 @@
esac
fi
+frv_extra_objs="$SIM_DV_SOCKSER_O"
-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"
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index 68487ab..df888d9 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -29,11 +29,7 @@
AC_SUBST(sim_trapdump)
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
+frv_extra_objs="$SIM_DV_SOCKSER_O"
+AC_SUBST(frv_extra_objs)
SIM_AC_OUTPUT
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 4e55722..ac4ea6b 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-30 Joel Sherrill <joel.sherrill@oarcorp.com>
+ Mike Frysinger <vapier@gentoo.org>
+
+ * configure.ac: Add m32r_extra_objs. Change simulator hardware
+ from always on to defaulting to yes it is enabled.
+ * Makefile.in: Conditionalize reference to dv-sockser.o.
+ * tconfig.in: Delete HAVE_DV_SOCKSER logic that was under "#if 0".
+ * configure: Regenerated.
+
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 89f1063..095ac9a 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -24,9 +24,6 @@
M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o
TRAPS_OBJ = @traps_obj@
-CONFIG_DEVICES = dv-sockser.o
-CONFIG_DEVICES =
-
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \
@@ -42,7 +39,7 @@
$(M32R2_OBJS) \
$(TRAPS_OBJ) \
devices.o \
- $(CONFIG_DEVICES)
+ $(m32r_extra_objs)
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 376acfb..7f0c05a 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -601,6 +601,7 @@
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
+m32r_extra_objs
SIM_DV_SOCKSER_O
sim_extra_cflags
traps_obj
@@ -12279,7 +12280,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12282 "configure"
+#line 12283 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12385,7 +12386,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12388 "configure"
+#line 12389 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13354,7 +13355,7 @@
-if test x"always" != x"no"; then
+if test x"yes" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
@@ -13385,7 +13386,7 @@
esac
if test "$sim_hw_p" != yes; then
- if test "always" = "always"; then
+ if test "yes" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi
@@ -13468,12 +13469,7 @@
esac
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
+m32r_extra_objs="$SIM_DV_SOCKSER_O"
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index f0422a2..76fed95 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -27,13 +27,8 @@
AC_SUBST(traps_obj)
AC_SUBST(sim_extra_cflags)
-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(yes,"","")
+m32r_extra_objs="$SIM_DV_SOCKSER_O"
+AC_SUBST(m32r_extra_objs)
SIM_AC_OUTPUT
diff --git a/sim/m32r/tconfig.in b/sim/m32r/tconfig.in
index f2599e3..1d159bc 100644
--- a/sim/m32r/tconfig.in
+++ b/sim/m32r/tconfig.in
@@ -35,9 +35,6 @@
#define SIM_BREAKPOINT { 0x10, 0xf1 }
#define SIM_BREAKPOINT_SIZE 2
#endif
-#if 0
-#define HAVE_DV_SOCKSER
-#endif
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
