aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@bitrange.com>2014-08-23 04:53:28 +0200
committerHans-Peter Nilsson <hp@bitrange.com>2014-08-23 04:53:28 +0200
commit9e3042ec073e05a0a5aa56398fd2662c5dcd5002 (patch)
tree4bf9df2da05331048e7c139910b8632e0334c31e
parentc4892a6b37647a0b33a2113b59762f678aabe4b2 (diff)
downloadgdb-9e3042ec073e05a0a5aa56398fd2662c5dcd5002.zip
gdb-9e3042ec073e05a0a5aa56398fd2662c5dcd5002.tar.gz
gdb-9e3042ec073e05a0a5aa56398fd2662c5dcd5002.tar.bz2
Fix m32r-elf sim, default hardware to off.
The situation here is similar to that of the other nearby (previous) sims fixed; it fails at the dv_sockser_install declaration in sim/m32r/tconfig.in. But, as opposed to e.g. frv, this *does* have a definition of UART_INCHAR_ADDR et al. It's somewhat tempting to keep sim-hardware enabled here but, I'm disabling it for the same reasons as for frv. Unsurprisingly (as m32r seems to be the template), the same confusing lines are in sim/m32r/Makefile.in as in sim/frv/Makefile.in at that time, deleted in 73e76d20. Again, commit 73e76d20 (for m32r as well as for frv) attempted to move the non-existing dv-sockser.o use to $(m32r_extra_objs) but missed that AC_SUBST would only affect @m32r_extra_objs@ and not $(m32r_extra_objs) per se so nothing happened. As for frv, I'm removing the $(m32r_extra_objs) too, to avoid confusion. Make check-sim for m32r-elf shows no regressions (5 failures; 100 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/m32r: * configure.ac: Default simulator hardware to off again. Remove dead m32r_extra_objs substitution. * configure: Regenerate. * Makefile.in: Remove unused frv_extra_objs.
-rw-r--r--sim/m32r/ChangeLog7
-rw-r--r--sim/m32r/Makefile.in3
-rwxr-xr-xsim/m32r/configure11
-rw-r--r--sim/m32r/configure.ac4
4 files changed, 13 insertions, 12 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 134d8d6..b9494af 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-23 Hans-Peter Nilsson <hp@axis.com>
+
+ * configure.ac: Default simulator hardware to off again. Remove
+ dead m32r_extra_objs substitution.
+ * configure: Regenerate.
+ * Makefile.in: Remove unused m32r_extra_objs.
+
2014-08-19 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 585eadf..2841a1b 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -38,8 +38,7 @@ SIM_OBJS = \
$(M32RX_OBJS) \
$(M32R2_OBJS) \
$(TRAPS_OBJ) \
- devices.o \
- $(m32r_extra_objs)
+ devices.o
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 27d71fd..dea90b7 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -601,7 +601,6 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
-m32r_extra_objs
SIM_DV_SOCKSER_O
sim_extra_cflags
traps_obj
@@ -12378,7 +12377,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12381 "configure"
+#line 12380 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12484,7 +12483,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12487 "configure"
+#line 12486 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13461,7 +13460,7 @@ fi
-if test x"yes" != x"no"; then
+if test x"no" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
@@ -13492,7 +13491,7 @@ case ${enable_sim_hardware} in
esac
if test "$sim_hw_p" != yes; then
- if test "yes" = "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
@@ -13575,8 +13574,6 @@ fi
esac
fi
-m32r_extra_objs="$SIM_DV_SOCKSER_O"
-
ac_sources="$sim_link_files"
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 76fed95..d5c728e 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -27,8 +27,6 @@ SIM_AC_OPTION_CGEN_MAINT
AC_SUBST(traps_obj)
AC_SUBST(sim_extra_cflags)
-SIM_AC_OPTION_HARDWARE(yes,"","")
-m32r_extra_objs="$SIM_DV_SOCKSER_O"
-AC_SUBST(m32r_extra_objs)
+SIM_AC_OPTION_HARDWARE(no,"","")
SIM_AC_OUTPUT