[RFC,1/4] Fix frv-elf sim, default hardware to off.

Message ID 201408200429.s7K4Tduf031707@ignucius.se.axis.com
State Committed
Headers

Commit Message

Hans-Peter Nilsson Aug. 20, 2014, 4:29 a.m. UTC
  At 2974be626, frv-elf (as do all these simulators) 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, but see m32r below.  Looking closer, "hardware support" for
this simulator was apparently never completed.  It 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: as sim/frv/config.in wasn't regenerated, 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 someone, like 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.


brgds, H-P
  

Patch

diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 295498e..ed7a592 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -32,8 +32,7 @@  SIM_OBJS = \
 	$(FRV_OBJS) \
 	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 \
-	$(frv_extra_objs)
+	devices.o reset.o registers.o
 
 # Extra headers included by sim-main.h.
 SIM_EXTRA_DEPS = \
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