diff options
| author | Hans-Peter Nilsson <hp@bitrange.com> | 2014-08-23 04:16:58 +0200 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@bitrange.com> | 2014-08-23 04:16:58 +0200 |
| commit | 105dd264de9a2fa7eee45eff897aa1d6171c1c4b (patch) | |
| tree | 7e6fd5f879083bc360f4e355b4c0f89ce08e2370 /sim/frv/configure | |
| parent | a05a36a5fc98c816381b25c37e8aa971cc86c28d (diff) | |
| download | fsf-binutils-gdb-105dd264de9a2fa7eee45eff897aa1d6171c1c4b.zip fsf-binutils-gdb-105dd264de9a2fa7eee45eff897aa1d6171c1c4b.tar.gz fsf-binutils-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')
| -rwxr-xr-x | sim/frv/configure | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sim/frv/configure b/sim/frv/configure index 5df284d..78b5450 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" |