OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sim: frv/m32r: back out hard failure when dv-sockser is not available 

These sims have optional support for the dv-sockser model, so do not make
them hard failures.  The Makefile made it seem like they didn't actually
support things dynamically, but a further code dive into the source and
the Makefile shows that things work out.
This commit is contained in:
Mike Frysinger 2013-03-31 00:39:35 +00:00
parent 37cf6fc121
commit 73e76d2003
9 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sim/frv/ChangeLog
View File

@ -1,3 +1,11 @@
2013-03-30 Joel Sherrill <joel.sherrill@oarcorp.com>
Mike Frysinger <vapier@gentoo.org>
* configure.ac: Add frv_extra_objs. Change simulator hardware
from always on to defaulting to yes it is enabled.
* Makefile.in: Conditionalize reference to dv-sockser.o.
* configure: Regenerated.
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

5
sim/frv/Makefile.in
View File

@ -19,9 +19,6 @@
FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o
CONFIG_DEVICES = dv-sockser.o
CONFIG_DEVICES =
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \
@ -36,7 +33,7 @@ SIM_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 \
$(CONFIG_DEVICES)
$(frv_extra_objs)
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \

11
sim/frv/configure vendored
View File

@ -601,6 +601,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
frv_extra_objs
SIM_DV_SOCKSER_O
sim_trapdump
cgen
@ -12278,7 +12279,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12281 "configure"
#line 12282 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12384,7 +12385,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12387 "configure"
#line 12388 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13428,12 +13429,8 @@ fi
esac
fi
frv_extra_objs="$SIM_DV_SOCKSER_O"
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"

8
sim/frv/configure.ac
View File

@ -29,11 +29,7 @@ fi],[sim_trapdump=""])dnl
AC_SUBST(sim_trapdump)
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
frv_extra_objs="$SIM_DV_SOCKSER_O"
AC_SUBST(frv_extra_objs)
SIM_AC_OUTPUT

9
sim/m32r/ChangeLog
View File

@ -1,3 +1,12 @@
2013-03-30 Joel Sherrill <joel.sherrill@oarcorp.com>
Mike Frysinger <vapier@gentoo.org>
* configure.ac: Add m32r_extra_objs. Change simulator hardware
from always on to defaulting to yes it is enabled.
* Makefile.in: Conditionalize reference to dv-sockser.o.
* tconfig.in: Delete HAVE_DV_SOCKSER logic that was under "#if 0".
* configure: Regenerated.
2013-03-26 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.

5
sim/m32r/Makefile.in
View File

@ -24,9 +24,6 @@ M32RX_OBJS = m32rx.o cpux.o decodex.o modelx.o mloopx.o
M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o
TRAPS_OBJ = @traps_obj@
CONFIG_DEVICES = dv-sockser.o
CONFIG_DEVICES =
SIM_OBJS = \
$(SIM_NEW_COMMON_OBJS) \
sim-cpu.o \
@ -42,7 +39,7 @@ SIM_OBJS = \
$(M32R2_OBJS) \
$(TRAPS_OBJ) \
devices.o \
$(CONFIG_DEVICES)
$(m32r_extra_objs)
# Extra headers included by sim-main.h.
SIM_EXTRA_DEPS = \

16
sim/m32r/configure vendored
View File

@ -601,6 +601,7 @@ ac_includes_default="\
ac_subst_vars='LTLIBOBJS
LIBOBJS
cgen_breaks
m32r_extra_objs
SIM_DV_SOCKSER_O
sim_extra_cflags
traps_obj
@ -12279,7 +12280,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12282 "configure"
#line 12283 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12385,7 +12386,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12388 "configure"
#line 12389 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13354,7 +13355,7 @@ fi
if test x"always" != x"no"; then
if test x"yes" != x"no"; then
enable_sim_hardware=yes
else
enable_sim_hardware=no
@ -13385,7 +13386,7 @@ case ${enable_sim_hardware} in
esac
if test "$sim_hw_p" != yes; then
if test "always" = "always"; then
if test "yes" = "always"; then
as_fn_error "Sorry, but this simulator requires that hardware support
be enabled. Please configure without --disable-hw-support." "$LINENO" 5
fi
@ -13468,12 +13469,7 @@ fi
esac
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
m32r_extra_objs="$SIM_DV_SOCKSER_O"

11
sim/m32r/configure.ac
View File

@ -27,13 +27,8 @@ SIM_AC_OPTION_CGEN_MAINT
AC_SUBST(traps_obj)
AC_SUBST(sim_extra_cflags)
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(yes,"","")
m32r_extra_objs="$SIM_DV_SOCKSER_O"
AC_SUBST(m32r_extra_objs)
SIM_AC_OUTPUT

3
sim/m32r/tconfig.in
View File

@ -35,9 +35,6 @@ MODULE_INSTALL_FN dv_sockser_install;
#define SIM_BREAKPOINT { 0x10, 0xf1 }
#define SIM_BREAKPOINT_SIZE 2
#endif
#if 0
#define HAVE_DV_SOCKSER
#endif
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use