aboutsummaryrefslogtreecommitdiff
path: root/sim/cris
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2021-04-22 19:51:54 -0600
committerTom Tromey <tom@tromey.com>2021-04-22 19:51:55 -0600
commite7d8f1da7116cd7d0ff0b7c363240d86e164fd7e (patch)
treee8ba2329312e35214877aacd89fcd01fbd43a153 /sim/cris
parentefd82ac7cb6af0b85efd6f105bae8923b913583d (diff)
downloadgdb-e7d8f1da7116cd7d0ff0b7c363240d86e164fd7e.zip
gdb-e7d8f1da7116cd7d0ff0b7c363240d86e164fd7e.tar.gz
gdb-e7d8f1da7116cd7d0ff0b7c363240d86e164fd7e.tar.bz2
Remove and modernize dependencies in sim
Some spots in the sim build used manual dependencies, and some spots did a compilation by hand but did not use the automatic dependency tracking code. This patch fixes these spots. I didn't touch ppc, because it doesn't use the common Makefile code. I also didn't touch objects that are for the build machine, because automatic dependencies don't work for those. sim/arm/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (armemu26.o, armemu32.o): Use COMPILE and POSTCOMPILE. sim/bpf/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (arch.o, cpu.o, sim-if.o, traps.o): Remove. (mloop-le.o, mloop-be.o, decode-le.o, decode-be.o, sim-le.o) (sim-be.o): Use COMPILE and POSTCOMPILE. (SIM_EXTRA_DEPS): Add eng-le.h, eng-be.h. sim/cr16/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (SIM_EXTRA_DEPS): New variable. (simops.o): Remove. sim/cris/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (sim-if.o, dv-cris.o, dv-rv.o, arch.o, traps.o) (devices.o, crisv10f.o, mloopv10f.o, cpuv10.o, decodev10.o) (modelv10.o, crisv32f.o, mloopv32f.o, cpuv32.o, decodev32.o) (modelv32.o): Remove. (SIM_EXTRA_DEPS): Add engv10.h. sim/d10v/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (SIM_EXTRA_DEPS): New variable. (simops.o): Remove. sim/frv/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (arch.o, devices.o, frv.o, traps.o, pipeline.o) (interrupts.o, memory.o, cache.o, options.o, reset.o) (registers.o, profile.o, profile-fr400.o, profile-fr450.o) (profile-fr500.o, profile-fr550.o, sim-if.o, mloop.o, cpu.o) (decode.o, sem.o, model.o): Remove. (SIM_EXTRA_DEPS): Add eng.h. sim/iq2000/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (sim-if.o): Remove. (arch.o): Use COMPILE and POSTCOMPILE. (devices.o, iq2000.o, mloop.o, cpu.o, decode.o, sem.o, model.o): Remove. (SIM_EXTRA_DEPS): Add eng.h. sim/lm32/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (arch.o, traps.o, sim-if.o, lm32.o, mloop.o) (cpu.o, decode.o, sem.o, model.o): Remove. (SIM_EXTRA_DEPS): Add eng.h. sim/m32r/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (sim-if.o, arch.o, traps.o, traps-linux.o) (devices.o, m32r.o, mloop.o, cpu.o, decode.o, sem.o, model.o) (m32rx.o, mloopx.o, cpux.o, decodex.o, semx.o, modelx.o) (m32r2.o, mloop2.o, cpu2.o, decode2.o, sem2.o, model2.o): Remove. (SIM_EXTRA_DEPS): Add eng.h, engx.h, eng2.h. sim/m68hc11/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (interp.o): Remove. sim/mips/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (interp.o, m16run.o, micromipsrun.o, multi-run.o): Remove. (SIM_EXTRA_DEPS): New variable. sim/mn10300/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (interp.o): Remove. (idecode.o op_utils.o semantics.o): Remove. sim/or1k/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (mloop.o, arch.o, cpu.o, decode.o, sem.o) (sem-switch.o, model.o): Remove. sim/rl78/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (err.o, fpu.o, gdb-if.o, load.o, main.o, mem.o) (reg.o, rl78.o): Remove. sim/rx/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (err.o, fpu.o, gdb-if.o, load.o, main.o, mem.o) (misc.o, reg.o, rx.o, syscalls.o, trace.o): Remove. sim/sh/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (SIM_EXTRA_DEPS): New variable. (interp.o): Remove. sim/v850/ChangeLog 2021-04-22 Tom Tromey <tom@tromey.com> * Makefile.in (interp.o, simops.o, semantics.o): Remove.
Diffstat (limited to 'sim/cris')
-rw-r--r--sim/cris/ChangeLog8
-rw-r--r--sim/cris/Makefile.in29
2 files changed, 9 insertions, 28 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 6298160..bcebb8f 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,5 +1,13 @@
2021-04-22 Tom Tromey <tom@tromey.com>
+ * Makefile.in (sim-if.o, dv-cris.o, dv-rv.o, arch.o, traps.o)
+ (devices.o, crisv10f.o, mloopv10f.o, cpuv10.o, decodev10.o)
+ (modelv10.o, crisv32f.o, mloopv32f.o, cpuv32.o, decodev32.o)
+ (modelv32.o): Remove.
+ (SIM_EXTRA_DEPS): Add engv10.h.
+
+2021-04-22 Tom Tromey <tom@tromey.com>
+
* configure: Rebuild.
2021-04-21 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index f932db2..87c1efe 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -36,7 +36,7 @@ SIM_OBJS = \
# FIXME: $(srccom)/cgen-ops.h should be in CGEN_INCLUDE_DEPS.
SIM_EXTRA_DEPS = \
$(CGEN_INCLUDE_DEPS) $(srccom)/cgen-ops.h \
- arch.h cpuall.h cris-sim.h cris-desc.h
+ arch.h cpuall.h cris-sim.h cris-desc.h engv10.h
SIM_EXTRA_CLEAN = cris-clean
@@ -47,19 +47,6 @@ NL_TARGET = -DNL_TARGET_cris
arch = cris
-sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(sim-core_h) $(sim-options_h)
-
-# Needs CPU-specific knowledge.
-dv-cris.o: dv-cris.c $(SIM_MAIN_DEPS) $(sim-core_h)
-
-# This is the same rule as dv-core.o etc.
-dv-rv.o: dv-rv.c $(hw_main_headers) $(sim_main_headers)
-
-arch.o: arch.c $(SIM_MAIN_DEPS)
-
-traps.o: traps.c targ-vals.h $(SIM_MAIN_DEPS) $(sim-options_h)
-devices.o: devices.c $(SIM_MAIN_DEPS)
-
# rvdummy is just used for testing. It does nothing if
# --enable-sim-hardware isn't active.
@@ -78,8 +65,6 @@ CRISV10F_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpuv10.h decodev10.h engv10.h
-crisv10f.o: crisv10f.c cris-tmpl.c $(CRISV10F_INCLUDE_DEPS)
-
# FIXME: What is mono and what does "Use of `mono' is wip" mean (other
# than the apparent; some "mono" feature is work in progress)?
mloopv10f.c engv10.h: stamp-v10fmloop
@@ -90,11 +75,6 @@ stamp-v10fmloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
$(SHELL) $(srcroot)/move-if-change eng.hin engv10.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloopv10f.c
touch stamp-v10fmloop
-mloopv10f.o: mloopv10f.c semcrisv10f-switch.c $(CRISV10F_INCLUDE_DEPS)
-
-cpuv10.o: cpuv10.c $(CRISV10F_INCLUDE_DEPS)
-decodev10.o: decodev10.c $(CRISV10F_INCLUDE_DEPS)
-modelv10.o: modelv10.c $(CRISV10F_INCLUDE_DEPS)
# CRISV32 objs
@@ -102,8 +82,6 @@ CRISV32F_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpuv32.h decodev32.h engv32.h
-crisv32f.o: crisv32f.c cris-tmpl.c $(CRISV32F_INCLUDE_DEPS)
-
# FIXME: What is mono and what does "Use of `mono' is wip" mean (other
# than the apparent; some "mono" feature is work in progress)?
mloopv32f.c engv32.h: stamp-v32fmloop
@@ -116,11 +94,6 @@ stamp-v32fmloop: stamp-v10fmloop $(srcdir)/../common/genmloop.sh mloop.in Makefi
$(SHELL) $(srcroot)/move-if-change eng.hin engv32.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloopv32f.c
touch stamp-v32fmloop
-mloopv32f.o: mloopv32f.c semcrisv32f-switch.c $(CRISV32F_INCLUDE_DEPS)
-
-cpuv32.o: cpuv32.c $(CRISV32F_INCLUDE_DEPS)
-decodev32.o: decodev32.c $(CRISV32F_INCLUDE_DEPS)
-modelv32.o: modelv32.c $(CRISV32F_INCLUDE_DEPS)
cris-clean:
for v in 10 32; do \