summaryrefslogtreecommitdiff
path: root/sim/cris
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-12-25 04:27:27 -0500
committerMike Frysinger <vapier@gentoo.org>2015-12-25 04:40:31 -0500
commit0d58595077841917ad57c9f8d2a61184a504ef40 (patch)
tree700d848c63f82b4284abebb23b1689a2272eb108 /sim/cris
parent8a0ebee658862bec66191df192c1d3b09bf0c943 (diff)
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.
Diffstat (limited to 'sim/cris')
-rw-r--r--sim/cris/ChangeLog5
-rw-r--r--sim/cris/Makefile.in1
-rw-r--r--sim/cris/tconfig.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index ff73db19a3..66ef461120 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,5 +1,10 @@
2015-12-25 Mike Frysinger <vapier@gentoo.org>
+ * Makefile.in (SIM_OBJS): Delete sim-model.o.
+ * tconfig.h (SIM_HAVE_MODEL): Delete.
+
+2015-12-25 Mike Frysinger <vapier@gentoo.org>
+
* arch.c: Rename MACH to SIM_MACH.
* cpuall.h: Likewise.
* modelv10.c: Rename MACH to SIM_MACH, MACH_IMP_PROPERTIES to
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 <http://www.gnu.org/licenses/>. */
/* For MSPR support. FIXME: revisit. */
#define WITH_DEVICES 1
-#define SIM_HAVE_MODEL
-
#endif /* CRIS_TCONFIG_H */