Fix sh64-elf sim, default hardware to off.
See nearby (previous) commit for the iq2000 sim; this similarly fails at the dv_sockser_install declaration in sim/sh64/tconfig.in. I'm disabling simulator hardware to be consistent with the state before94c63d78f
(2013-03-23) and with the actions for the frv sim and the iq2000 sim. Make check-sim for sh64-elf shows no regressions (25 failures; 357 expected passes) compared tobf3d9781ec
(before the recent config.in regen, after sim-hardware mostly-enabled) andeed23bb4a1
(before the sim-hardware mostly-enabled; 2013-03-23). sim/sh64: * configure.ac: Default simulator hardware to off again without emitting errors when off or dv-sockser.o unavailable. * configure: Regenerate.
This commit is contained in:
parent
3df3af7c3f
commit
c4892a6b37
@ -1,3 +1,9 @@
|
||||
2014-08-23 Hans-Peter Nilsson <hp@axis.com>
|
||||
|
||||
* configure.ac: Default simulator hardware to off again
|
||||
without emitting errors when off or dv-sockser.o unavailable.
|
||||
* configure: Regenerate.
|
||||
|
||||
2014-08-19 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* configure: Regenerate.
|
||||
|
10
sim/sh64/configure
vendored
10
sim/sh64/configure
vendored
@ -13445,7 +13445,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
|
||||
@ -13476,7 +13476,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
|
||||
@ -13560,12 +13560,6 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$SIM_DV_SOCKSER_O"; then
|
||||
as_fn_error "Sorry, but hardware support in this simulator
|
||||
unconditionally relies on dv-sockser.o which is unavailable for your host.
|
||||
Please fix this simulator." "$LINENO" 5
|
||||
fi
|
||||
|
||||
|
||||
ac_sources="$sim_link_files"
|
||||
ac_dests="$sim_link_links"
|
||||
|
@ -14,13 +14,7 @@ SIM_AC_OPTION_ENVIRONMENT
|
||||
SIM_AC_OPTION_INLINE()
|
||||
SIM_AC_OPTION_CGEN_MAINT
|
||||
|
||||
SIM_AC_OPTION_HARDWARE(always,"","")
|
||||
|
||||
if test -z "$SIM_DV_SOCKSER_O"; then
|
||||
AC_MSG_ERROR([Sorry, but hardware support in this simulator
|
||||
unconditionally relies on dv-sockser.o which is unavailable for your host.
|
||||
Please fix this simulator.])
|
||||
fi
|
||||
SIM_AC_OPTION_HARDWARE(no,"","")
|
||||
|
||||
SIM_AC_OUTPUT
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user