From 0d58595077841917ad57c9f8d2a61184a504ef40 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 25 Dec 2015 04:27:27 -0500 Subject: sim: sim-model: build for everyone Rather than include this for some targets, set it up so we can build it all the time via the common code. This makes it easier for targets to opt into it when they're ready, increases build coverage, and allows us to centralize much of the logic. We also get to delete tconfig.h from two more targets -- they were setting WITH_DEVICES to 0 which has the same behavior as not defining it at all. While the SIM_HAVE_MODEL knob is gone, we now have WITH_MODEL_P, but it is only used by the common sim-model code. We use it to declare dummy model lists when the arch hasn't created its own. --- sim/cris/ChangeLog | 5 +++++ sim/cris/Makefile.in | 1 - sim/cris/tconfig.h | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'sim/cris') diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index ff73db19a3..66ef461120 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2015-12-25 Mike Frysinger + + * Makefile.in (SIM_OBJS): Delete sim-model.o. + * tconfig.h (SIM_HAVE_MODEL): Delete. + 2015-12-25 Mike Frysinger * arch.c: Rename MACH to SIM_MACH. diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in index f7762dd797..384922f746 100644 --- a/sim/cris/Makefile.in +++ b/sim/cris/Makefile.in @@ -24,7 +24,6 @@ CRISV32F_OBJS = crisv32f.o cpuv32.o decodev32.o modelv32.o mloopv32f.o SIM_OBJS = \ $(SIM_NEW_COMMON_OBJS) \ - sim-model.o \ cgen-utils.o cgen-trace.o cgen-scache.o \ cgen-run.o \ sim-if.o arch.o \ diff --git a/sim/cris/tconfig.h b/sim/cris/tconfig.h index 05d86233ea..2ac6c5bd80 100644 --- a/sim/cris/tconfig.h +++ b/sim/cris/tconfig.h @@ -27,6 +27,4 @@ along with this program. If not, see . */ /* For MSPR support. FIXME: revisit. */ #define WITH_DEVICES 1 -#define SIM_HAVE_MODEL - #endif /* CRIS_TCONFIG_H */ -- cgit v1.2.3