diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2013-03-31 00:39:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-31 00:39:35 +0000 |
| commit | 73e76d20031e4c59fa47e9c0dca449f8351a3657 (patch) | |
| tree | bf28326eb37d7fdc262c1bc88b6eeb5eed7b002b /sim/frv | |
| parent | 37cf6fc12167035748c548a6258d2e5de85e7980 (diff) | |
| download | fsf-binutils-gdb-73e76d20031e4c59fa47e9c0dca449f8351a3657.zip fsf-binutils-gdb-73e76d20031e4c59fa47e9c0dca449f8351a3657.tar.gz fsf-binutils-gdb-73e76d20031e4c59fa47e9c0dca449f8351a3657.tar.bz2 | |
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.
Diffstat (limited to 'sim/frv')
| -rw-r--r-- | sim/frv/ChangeLog | 8 | ||||
| -rw-r--r-- | sim/frv/Makefile.in | 5 | ||||
| -rwxr-xr-x | sim/frv/configure | 11 | ||||
| -rw-r--r-- | sim/frv/configure.ac | 8 |
4 files changed, 15 insertions, 17 deletions
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 820c17f..9e995bc 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -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. diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index 8960319..a0a17e8 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -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 = \ diff --git a/sim/frv/configure b/sim/frv/configure index aa41286..c42dfd7 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -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" diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index 68487ab..df888d9 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -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 |