aboutsummaryrefslogtreecommitdiff
path: root/sim/frv/configure.ac
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@bitrange.com>2014-08-23 04:16:58 +0200
committerHans-Peter Nilsson <hp@bitrange.com>2014-08-23 04:16:58 +0200
commit105dd264de9a2fa7eee45eff897aa1d6171c1c4b (patch)
tree7e6fd5f879083bc360f4e355b4c0f89ce08e2370 /sim/frv/configure.ac
parenta05a36a5fc98c816381b25c37e8aa971cc86c28d (diff)
downloadgdb-105dd264de9a2fa7eee45eff897aa1d6171c1c4b.zip
gdb-105dd264de9a2fa7eee45eff897aa1d6171c1c4b.tar.gz
gdb-105dd264de9a2fa7eee45eff897aa1d6171c1c4b.tar.bz2
Fix frv-elf sim, default hardware to off.
At 2974be626, frv-elf fails at the dv_sockser_install declaration in sim/frv/tconfig.in. But, with the trivial #include's added (see other sims tconfig.in, like cris or mn10300), it *still* fails building sim/frv/devices.c because of a missing UART_INCHAR_ADDR. I have no insight into what'd be a valid value, except that there's a definition in m32r, which was probably used as a template with frv not finished. Simulated hardware should not have been be enabled, and was indeed not enabled by default before 94c63d78f (2013-03-23), where it seems to have been enabled for no simulator-specific reason. Except dv-sockser.o wasn't enabled even then: sim/frv/config.in wasn't regenerated, so HAVE_DV_SOCKSER was never defined. Maybe people were fooled by this in sim/frv/Makefile.in at that time (these two lines were later deleted, in 73e76d20): CONFIG_DEVICES = dv-sockser.o CONFIG_DEVICES = (As it seems people have missed it before: the second line overrides the first...) I'm guessing these lines were part of the never-completed hardware-support. Commit 73e76d20 attempted to move the imagined dv-sockser.o from $(CONFIG_DEVICES) to $(frv_extra_objs) but missed that AC_SUBST would only affect @frv_extra_objs@ (not $(frv_extra_objs) per se) so nothing happened regarding sockser: dv-sockser.o was not compiled and HAVE_DV_SOCKSER was not defined. I'm removing the $(frv_extra_objs) too, to avoid confusion. The best action seems to be disabling all hardware support by default again until a specific sim maintainer finishes the work. Make check-sim for frv-elf shows no failures after this. sim/frv: * configure.ac: Default simulator hardware to off again. Remove dead frv_extra_objs substitution. * configure: Regenerate. * Makefile.in: Remove unused frv_extra_objs.
Diffstat (limited to 'sim/frv/configure.ac')
-rw-r--r--sim/frv/configure.ac4
1 files changed, 1 insertions, 3 deletions
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index df888d9..05faf03 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -28,8 +28,6 @@ if test x"$silent" != x"yes" && test x"$sim_trapdump" != x""; then
fi],[sim_trapdump=""])dnl
AC_SUBST(sim_trapdump)
-SIM_AC_OPTION_HARDWARE(always,"","")
-frv_extra_objs="$SIM_DV_SOCKSER_O"
-AC_SUBST(frv_extra_objs)
+SIM_AC_OPTION_HARDWARE(no,"","")
SIM_AC_OUTPUT