From 105dd264de9a2fa7eee45eff897aa1d6171c1c4b Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sat, 23 Aug 2014 04:16:58 +0200 Subject: [PATCH] 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. --- sim/frv/ChangeLog | 7 +++++++ sim/frv/Makefile.in | 3 +-- sim/frv/configure | 11 ++++------- sim/frv/configure.ac | 4 +--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 93ef9875ff1..d83bb8d03e6 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,10 @@ +2014-08-23 Hans-Peter Nilsson + + * configure.ac: Default simulator hardware to off again. Remove + dead frv_extra_objs substitution. + * configure: Regenerate. + * Makefile.in: Remove unused frv_extra_objs. + 2014-08-19 Alan Modra * configure: Regenerate. diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index 295498ef770..ed7a5924ae5 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 b/sim/frv/configure index 5df284d5f70..78b5450af75 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -601,7 +601,6 @@ ac_includes_default="\ ac_subst_vars='LTLIBOBJS LIBOBJS cgen_breaks -frv_extra_objs SIM_DV_SOCKSER_O sim_trapdump cgen @@ -12377,7 +12376,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12380 "configure" +#line 12379 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12483,7 +12482,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12486 "configure" +#line 12485 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13421,7 +13420,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 @@ -13452,7 +13451,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 @@ -13535,8 +13534,6 @@ fi esac fi -frv_extra_objs="$SIM_DV_SOCKSER_O" - ac_sources="$sim_link_files" diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index df888d93f8e..05faf03763f 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 -- 2.30.2