From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 05/10] Remove and modernize dependencies in sim
Date: Thu, 8 Apr 2021 14:33:07 -0600 [thread overview]
Message-ID: <20210408203312.2938165-6-tom@tromey.com> (raw)
In-Reply-To: <20210408203312.2938165-1-tom@tromey.com>
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.
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (armemu26.o, armemu32.o): Use COMPILE and
POSTCOMPILE.
sim/bpf/ChangeLog
2021-04-08 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/cr16/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (SIM_EXTRA_DEPS): New variable.
(simops.o): Remove.
sim/cris/ChangeLog
2021-04-08 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/d10v/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (SIM_EXTRA_DEPS): New variable.
(simops.o): Remove.
sim/frv/ChangeLog
2021-04-08 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/iq2000/ChangeLog
2021-04-08 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/lm32/ChangeLog
2021-04-08 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/m32r/ChangeLog
2021-04-08 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/m68hc11/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (interp.o): Remove.
sim/mips/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (interp.o, m16run.o, micromipsrun.o, multi-run.o):
Remove.
sim/mn10300/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (interp.o): Remove.
(idecode.o op_utils.o semantics.o): Remove.
sim/or1k/ChangeLog
2021-04-08 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-08 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-08 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-08 Tom Tromey <tom@tromey.com>
* Makefile.in (SIM_EXTRA_DEPS): New variable.
(interp.o): Remove.
sim/v850/ChangeLog
2021-04-08 Tom Tromey <tom@tromey.com>
* Makefile.in (interp.o, simops.o, semantics.o): Remove.
---
sim/arm/ChangeLog | 5 +++++
sim/arm/Makefile.in | 10 ++++++----
sim/bpf/ChangeLog | 6 ++++++
sim/bpf/Makefile.in | 37 +++++++++++++++----------------------
sim/cr16/ChangeLog | 5 +++++
sim/cr16/Makefile.in | 4 ++--
sim/cris/ChangeLog | 7 +++++++
sim/cris/Makefile.in | 27 ---------------------------
sim/d10v/ChangeLog | 5 +++++
sim/d10v/Makefile.in | 4 ++--
sim/frv/ChangeLog | 8 ++++++++
sim/frv/Makefile.in | 27 ---------------------------
sim/iq2000/ChangeLog | 7 +++++++
sim/iq2000/Makefile.in | 17 +++--------------
sim/lm32/ChangeLog | 5 +++++
sim/lm32/Makefile.in | 14 --------------
sim/m32r/ChangeLog | 7 +++++++
sim/m32r/Makefile.in | 32 --------------------------------
sim/m68hc11/ChangeLog | 4 ++++
sim/m68hc11/Makefile.in | 2 --
sim/mips/ChangeLog | 5 +++++
sim/mips/Makefile.in | 9 ---------
sim/mn10300/ChangeLog | 5 +++++
sim/mn10300/Makefile.in | 4 ----
sim/or1k/ChangeLog | 5 +++++
sim/or1k/Makefile.in | 7 -------
sim/rl78/ChangeLog | 5 +++++
sim/rx/ChangeLog | 5 +++++
sim/rx/Makefile.in | 16 ----------------
sim/sh/ChangeLog | 5 +++++
sim/sh/Makefile.in | 3 +--
sim/v850/ChangeLog | 4 ++++
sim/v850/Makefile.in | 4 ----
33 files changed, 122 insertions(+), 188 deletions(-)
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index ff8beb5ce34..29166952ce1 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -29,8 +29,10 @@ SIM_OBJS = \
## COMMON_POST_CONFIG_FRAG
-armemu26.o: armemu.c armdefs.h armemu.h
- $(CC) -c $(srcdir)/armemu.c -o armemu26.o $(ALL_CFLAGS)
+armemu26.o: armemu.c
+ $(COMPILE) $(srcdir)/armemu.c
+ $(POSTCOMPILE)
-armemu32.o: armemu.c armdefs.h armemu.h
- $(CC) -c $(srcdir)/armemu.c -o armemu32.o -DMODE32 $(ALL_CFLAGS)
+armemu32.o: armemu.c
+ $(COMPILE) -DMODE32 $(srcdir)/armemu.c
+ $(POSTCOMPILE)
diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in
index 8052a900713..b29b3c02dc0 100644
--- a/sim/bpf/Makefile.in
+++ b/sim/bpf/Makefile.in
@@ -60,33 +60,26 @@ BPF_INCLUDE_DEPS = \
# Dependencies for binaries from CGEN generated source
-arch.o: arch.c $(SIM_MAIN_DEPS)
-cpu.o: cpu.c $(BPF_INCLUDE_DEPS)
-decode-le.o: decode-le.c $(BPF_INCLUDE_DEPS)
-decode-be.o: decode-be.c $(BPF_INCLUDE_DEPS)
-
-sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h eng.h
- $(COMPILE) $<
+mloop-le.o: mloop-le.c
+ $(COMPILE) -DWANT_ISA_EBPFLE mloop-le.c
$(POSTCOMPILE)
-
-traps.o: traps.c $(SIM_MAIN_DEPS) eng.h
- $(COMPILE) $<
+mloop-be.o: mloop-be.c
+ $(COMPILE) -DWANT_ISA_EBPFBE mloop-be.c
$(POSTCOMPILE)
-mloop-le.o: mloop-le.c $(BPF_INCLUDE_DEPS)
- $(CC) -c mloop-le.c $(ALL_CFLAGS) -DWANT_ISA_EBPFLE
-mloop-be.o: mloop-be.c $(BPF_INCLUDE_DEPS)
- $(CC) -c mloop-be.c $(ALL_CFLAGS) -DWANT_ISA_EBPFBE
-
-decode-le.o: decode-le.c $(BPF_INCLUDE_DEPS)
- $(CC) -c $(srcdir)/decode-le.c $(ALL_CFLAGS) -DWANT_ISA_EBPFLE
+decode-le.o: decode-le.c
+ $(COMPILE) -DWANT_ISA_EBPFLE $(srcdir)/decode-le.c
+ $(POSTCOMPILE)
decode-be.o: decode-be.c $(BPF_INCLUDE_DEPS)
- $(CC) -c $(srcdir)/decode-be.c $(ALL_CFLAGS) -DWANT_ISA_EBPFBE
+ $(COMPILE) -DWANT_ISA_EBPFBE $(srcdir)/decode-be.c
+ $(POSTCOMPILE)
-sem-le.o: sem-le.c $(BPF_INCLUDE_DEPS)
- $(CC) -c $(srcdir)/sem-le.c $(ALL_CFLAGS) -DWANT_ISA_EBPFLE
-sem-be.o: sem-be.c $(BPF_INCLUDE_DEPS)
- $(CC) -c $(srcdir)/sem-be.c $(ALL_CFLAGS) -DWANT_ISA_EBPFBE
+sem-le.o: sem-le.c
+ $(COMPILE) -DWANT_ISA_EBPFLE $(srcdir)/sem-le.c
+ $(POSTCOMPILE)
+sem-be.o: sem-be.c
+ $(COMPILE) -DWANT_ISA_EBPFBE $(srcdir)/sem-be.c
+ $(POSTCOMPILE)
arch = bpf
diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index 7be0537985b..8cfe3ea3b26 100644
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -25,6 +25,8 @@ SIM_OBJS = \
simops.o
SIM_EXTRA_CLEAN = clean-extra
+SIM_EXTRA_DEPS = simops.h
+
INCLUDE = cr16_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h \
$(srcroot)/include/gdb/sim-cr16.h
@@ -33,8 +35,6 @@ NL_TARGET = -DNL_TARGET_cr16
## COMMON_POST_CONFIG_FRAG
-simops.o: simops.h
-
simops.h: gencode
./gencode -h >$@
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index f932db28a79..5879cffe80b 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -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 \
diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index c2907fc5879..13b902dec5d 100644
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -26,6 +26,8 @@ SIM_OBJS = \
endian.o
SIM_EXTRA_CLEAN = clean-extra
+SIM_EXTRA_DEPS = simops.h
+
INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
$(srcroot)/include/gdb/sim-d10v.h
@@ -34,8 +36,6 @@ NL_TARGET = -DNL_TARGET_d10v
## COMMON_POST_CONFIG_FRAG
-simops.o: simops.h
-
simops.h: gencode
./gencode -h >$@
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 63d18df31b6..0d40a568fdd 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -47,10 +47,6 @@ NL_TARGET = -DNL_TARGET_frv
arch = frv
-arch.o: arch.c $(SIM_MAIN_DEPS)
-
-devices.o: devices.c $(SIM_MAIN_DEPS)
-
# FRV objs
FRVBF_INCLUDE_DEPS = \
@@ -58,23 +54,6 @@ FRVBF_INCLUDE_DEPS = \
$(SIM_EXTRA_DEPS) \
cpu.h decode.h eng.h
-frv.o: frv.c $(FRVBF_INCLUDE_DEPS)
-traps.o: traps.c $(FRVBF_INCLUDE_DEPS)
-pipeline.o: pipeline.c $(FRVBF_INCLUDE_DEPS)
-interrupts.o: interrupts.c $(FRVBF_INCLUDE_DEPS)
-memory.o: memory.c $(FRVBF_INCLUDE_DEPS)
-cache.o: cache.c $(FRVBF_INCLUDE_DEPS)
-options.o: options.c $(FRVBF_INCLUDE_DEPS)
-reset.o: reset.c $(FRVBF_INCLUDE_DEPS)
-registers.o: registers.c $(FRVBF_INCLUDE_DEPS)
-profile.o: profile.c profile-fr400.h profile-fr500.h profile-fr550.h $(FRVBF_INCLUDE_DEPS)
-profile-fr400.o: profile-fr400.c profile-fr400.h $(FRVBF_INCLUDE_DEPS)
-profile-fr450.o: profile-fr450.c $(FRVBF_INCLUDE_DEPS)
-profile-fr500.o: profile-fr500.c profile-fr500.h $(FRVBF_INCLUDE_DEPS)
-profile-fr550.o: profile-fr550.c profile-fr550.h $(FRVBF_INCLUDE_DEPS)
-sim-if.o: sim-if.c $(FRVBF_INCLUDE_DEPS) $(srcdir)/../common/sim-core.h eng.h
-
-
# FIXME: Use of `mono' is wip.
mloop.c eng.h: stamp-mloop
stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
@@ -84,12 +63,6 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c
touch stamp-mloop
-mloop.o: mloop.c $(FRVBF_INCLUDE_DEPS)
-
-cpu.o: cpu.c $(FRVBF_INCLUDE_DEPS)
-decode.o: decode.c $(FRVBF_INCLUDE_DEPS)
-sem.o: sem.c $(FRVBF_INCLUDE_DEPS)
-model.o: model.c $(FRVBF_INCLUDE_DEPS)
frv-clean:
rm -f mloop.c eng.h stamp-mloop
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index f3ab6351b25..18d0715ec59 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -41,12 +41,9 @@ SIM_EXTRA_CLEAN = iq2000-clean
arch = iq2000
-sim-if.o: $(srcdir)/sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h
-
-arch.o: arch.c $(SIM_MAIN_DEPS)
- $(CC) -c $(srcdir)/arch.c $(ALL_CFLAGS) -UHAVE_CPU_IQ10BF
-
-devices.o: $(srcdir)/devices.c $(SIM_MAIN_DEPS)
+arch.o: arch.c
+ $(COMPILE) -UHAVE_CPU_IQ10BF $(srcdir)/arch.c
+ $(POSTCOMPILE)
# IQ2000 objs
@@ -54,8 +51,6 @@ IQ2000BF_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpu.h decode.h eng.h
-iq2000.o: $(srcdir)/iq2000.c $(IQ2000BF_INCLUDE_DEPS)
-
# FIXME: Use of `mono' is wip.
mloop.c eng.h: stamp-mloop
stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
@@ -65,12 +60,6 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c
touch stamp-mloop
-mloop.o: mloop.c $(srcdir)/sem-switch.c $(IQ2000BF_INCLUDE_DEPS)
-
-cpu.o: $(srcdir)/cpu.c $(IQ2000BF_INCLUDE_DEPS)
-decode.o: $(srcdir)/decode.c $(IQ2000BF_INCLUDE_DEPS)
-sem.o: $(srcdir)/sem.c $(IQ2000BF_INCLUDE_DEPS)
-model.o: $(srcdir)/model.c $(IQ2000BF_INCLUDE_DEPS)
iq2000-clean:
rm -f mloop.c eng.h stamp-mloop
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 6a71aceb45b..834c41150a1 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -28,18 +28,10 @@ NL_TARGET = -DNL_TARGET_lm32
arch = lm32
-arch.o: arch.c $(SIM_MAIN_DEPS)
-
-traps.o: traps.c targ-vals.h $(SIM_MAIN_DEPS)
-
-sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h
-
LM32BF_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpu.h decode.h eng.h
-lm32.o: lm32.c $(LM32BF_INCLUDE_DEPS)
-
# FIXME: Use of `mono' is wip.
mloop.c eng.h: stamp-mloop
stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
@@ -49,12 +41,6 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c
touch stamp-mloop
-mloop.o: mloop.c sem-switch.c
-
-cpu.o: cpu.c $(LM32BF_INCLUDE_DEPS)
-decode.o: decode.c $(LM32BF_INCLUDE_DEPS)
-sem.o: sem.c $(LM32BF_INCLUDE_DEPS)
-model.o: model.c $(LM32BF_INCLUDE_DEPS)
lm32-clean:
rm -f mloop.c eng.h stamp-mloop
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 4111c2e17d2..9b24995860d 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -50,22 +50,12 @@ NL_TARGET = -DNL_TARGET_m32r
arch = m32r
-sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h
-
-arch.o: arch.c $(SIM_MAIN_DEPS)
-
-traps.o: traps.c targ-vals.h $(SIM_MAIN_DEPS)
-traps-linux.o: traps.c syscall.h targ-vals.h $(SIM_MAIN_DEPS)
-devices.o: devices.c $(SIM_MAIN_DEPS)
-
# M32R objs
M32RBF_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpu.h decode.h eng.h
-m32r.o: m32r.c $(M32RBF_INCLUDE_DEPS)
-
# FIXME: Use of `mono' is wip.
mloop.c eng.h: stamp-mloop ; @true
stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
@@ -75,12 +65,6 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c
touch stamp-mloop
-mloop.o: mloop.c sem-switch.c $(M32RBF_INCLUDE_DEPS)
-
-cpu.o: cpu.c $(M32RBF_INCLUDE_DEPS)
-decode.o: decode.c $(M32RBF_INCLUDE_DEPS)
-sem.o: sem.c $(M32RBF_INCLUDE_DEPS)
-model.o: model.c $(M32RBF_INCLUDE_DEPS)
# M32RX objs
@@ -88,8 +72,6 @@ M32RXF_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpux.h decodex.h engx.h
-m32rx.o: m32rx.c $(M32RXF_INCLUDE_DEPS)
-
# FIXME: Use of `mono' is wip.
mloopx.c engx.h: stamp-xmloop ; @true
stamp-xmloop: $(srcdir)/../common/genmloop.sh mloopx.in Makefile
@@ -100,12 +82,6 @@ stamp-xmloop: $(srcdir)/../common/genmloop.sh mloopx.in Makefile
$(SHELL) $(srcroot)/move-if-change engx.hin engx.h
$(SHELL) $(srcroot)/move-if-change mloopx.cin mloopx.c
touch stamp-xmloop
-mloopx.o: mloopx.c semx-switch.c $(M32RXF_INCLUDE_DEPS)
-
-cpux.o: cpux.c $(M32RXF_INCLUDE_DEPS)
-decodex.o: decodex.c $(M32RXF_INCLUDE_DEPS)
-semx.o: semx.c $(M32RXF_INCLUDE_DEPS)
-modelx.o: modelx.c $(M32RXF_INCLUDE_DEPS)
# M32R2 objs
@@ -113,8 +89,6 @@ M32R2F_INCLUDE_DEPS = \
$(CGEN_MAIN_CPU_DEPS) \
cpu2.h decode2.h eng2.h
-m32r2.o: m32r2.c $(M32R2F_INCLUDE_DEPS)
-
# FIXME: Use of `mono' is wip.
mloop2.c eng2.h: stamp-2mloop ; @true
stamp-2mloop: $(srcdir)/../common/genmloop.sh mloop2.in Makefile
@@ -126,12 +100,6 @@ stamp-2mloop: $(srcdir)/../common/genmloop.sh mloop2.in Makefile
$(SHELL) $(srcroot)/move-if-change mloop2.cin mloop2.c
touch stamp-2mloop
-mloop2.o: mloop2.c $(srcdir)/sem2-switch.c $(M32R2F_INCLUDE_DEPS)
-cpu2.o: cpu2.c $(M32R2F_INCLUDE_DEPS)
-decode2.o: decode2.c $(M32R2F_INCLUDE_DEPS)
-sem2.o: sem2.c $(M32R2F_INCLUDE_DEPS)
-model2.o: model2.c $(M32R2F_INCLUDE_DEPS)
-
m32r-clean:
rm -f mloop.c eng.h stamp-mloop
rm -f mloopx.c engx.h stamp-xmloop
diff --git a/sim/m68hc11/Makefile.in b/sim/m68hc11/Makefile.in
index 9e2248fc638..9ebcf65c629 100644
--- a/sim/m68hc11/Makefile.in
+++ b/sim/m68hc11/Makefile.in
@@ -54,7 +54,5 @@ gencode.o: gencode.c
gencode: gencode.o
$(LINK_FOR_BUILD) $^
-interp.o: interp.c $(INCLUDE)
-
clean-extra:
rm -f gencode m68hc11int.c
diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 00906451c4c..c150224041f 100644
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -86,15 +86,6 @@ SIM_EXTRA_LIBS = $(MIPS_EXTRA_LIBS)
## COMMON_POST_CONFIG_FRAG
-interp.o: $(srcdir)/interp.c config.h sim-main.h itable.h
-
-m16run.o: sim-main.h m16_idecode.h m32_idecode.h m16run.c $(SIM_EXTRA_DEPS)
-
-micromipsrun.o: sim-main.h micromips16_idecode.h micromips32_idecode.h \
- micromips_m32_idecode.h micromipsrun.c $(SIM_EXTRA_DEPS)
-
-multi-run.o: multi-include.h tmp-mach-multi
-
IGEN_TRACE= # -G omit-line-numbers # -G trace-rule-selection -G trace-rule-rejection -G trace-entries # -G trace-all
IGEN_INSN=$(srcdir)/mips.igen
IGEN_DC=$(srcdir)/mips.dc
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index 773b7f9a0c5..b966b07187b 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -39,8 +39,6 @@ SIM_EXTRA_CFLAGS = -DPOLL_QUIT_INTERVAL=0x20
## COMMON_POST_CONFIG_FRAG
-idecode.o op_utils.o semantics.o: targ-vals.h
-
BUILT_SRC_FROM_IGEN = \
icache.h \
icache.c \
@@ -109,5 +107,3 @@ tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
$(SHELL) $(srcdir)/../../move-if-change tmp-engine.c engine.c
$(SHELL) $(srcdir)/../../move-if-change tmp-irun.c irun.c
touch tmp-igen
-
-interp.o: interp.c $(INCLUDE)
diff --git a/sim/or1k/Makefile.in b/sim/or1k/Makefile.in
index 24625603cb0..649486fd4e1 100644
--- a/sim/or1k/Makefile.in
+++ b/sim/or1k/Makefile.in
@@ -75,16 +75,9 @@ stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
$(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c
touch stamp-mloop
-mloop.o: mloop.c sem-switch.c $(OR1K32BF_INCLUDE_DEPS)
or1k.o: or1k.c $(OR1K32BF_INCLUDE_DEPS)
$(COMPILE) $<
$(POSTCOMPILE)
-arch.o: arch.c $(SIM_MAIN_DEPS)
-cpu.o: cpu.c $(OR1K32BF_INCLUDE_DEPS)
-decode.o: decode.c $(OR1K32BF_INCLUDE_DEPS)
-sem.o: sem.c $(OR1K32BF_INCLUDE_DEPS)
-sem-switch.o: sem-switch.c $(OR1K32BF_INCLUDE_DEPS)
-model.o: model.c $(OR1K32BF_INCLUDE_DEPS)
sim-if.o: sim-if.c $(SIM_MAIN_DEPS) $(srcdir)/../common/sim-core.h eng.h
$(COMPILE) $<
diff --git a/sim/rx/Makefile.in b/sim/rx/Makefile.in
index 4de062153c7..de5bcfc148b 100644
--- a/sim/rx/Makefile.in
+++ b/sim/rx/Makefile.in
@@ -44,19 +44,3 @@ LIBS = $B/bfd/libbfd.a $B/libiberty/libiberty.a
## COMMON_POST_CONFIG_FRAG
arch = rx
-
-err.o : err.h
-fpu.o : cpu.h fpu.h
-gdb-if.o : cpu.h mem.h load.h syscalls.h err.h \
- $(srcdir)/../../include/gdb/callback.h \
- $(srcdir)/../../include/gdb/remote-sim.h \
- $(srcdir)/../../include/gdb/signals.h \
- $(srcdir)/../../include/gdb/sim-rx.h
-load.o : ../../bfd/bfd.h cpu.h mem.h
-main.o : ../../bfd/bfd.h cpu.h mem.h misc.h load.h trace.h err.h
-mem.o : mem.h cpu.h syscalls.h misc.h err.h
-misc.o : cpu.h misc.h
-reg.o : cpu.h trace.h
-rx.o : $(srcdir)/../../include/opcode/rx.h cpu.h mem.h syscalls.h fpu.h
-syscalls.o : $(srcdir)/../../include/gdb/callback.h cpu.h mem.h syscalls.h syscall.h
-trace.o : ../../bfd/bfd.h $(srcdir)/../../include/dis-asm.h cpu.h mem.h load.h
diff --git a/sim/sh/Makefile.in b/sim/sh/Makefile.in
index 54f1e0ab94b..3910c4f5614 100644
--- a/sim/sh/Makefile.in
+++ b/sim/sh/Makefile.in
@@ -23,11 +23,10 @@ SIM_OBJS = \
table.o
SIM_EXTRA_LIBS = -lm
SIM_EXTRA_CLEAN = sh-clean
+SIM_EXTRA_DEPS = table.c code.c ppi.c
## COMMON_POST_CONFIG_FRAG
-interp.o: interp.c code.c table.c ppi.c $(srcroot)/include/gdb/sim-sh.h
-
code.c: gencode
./gencode -x >code.c
# indent code.c
diff --git a/sim/v850/Makefile.in b/sim/v850/Makefile.in
index 250129c549f..1f9d8c55c37 100644
--- a/sim/v850/Makefile.in
+++ b/sim/v850/Makefile.in
@@ -110,7 +110,3 @@ tmp-igen: $(IGEN_INSN) $(IGEN_DC) ../igen/igen
clean-extra: clean-igen
rm -f table.c simops.h gencode
-
-interp.o: interp.c $(INCLUDE)
-simops.o: simops.c simops.h $(INCLUDE) targ-vals.h
-semantics.o: $(INCLUDE)
--
2.26.2
next prev parent reply other threads:[~2021-04-08 20:33 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 20:33 [PATCH 00/10] sim build improvements Tom Tromey
2021-04-08 20:33 ` [PATCH 01/10] Make mostlyclean an alias for clean Tom Tromey
2021-04-09 0:25 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 02/10] Introduce stamp file for hw-config.h Tom Tromey
2021-04-09 0:25 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 03/10] Add stamp files for generated files in sim/ppc Tom Tromey
2021-04-09 0:25 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 04/10] Require GNU make Tom Tromey
2021-04-09 0:31 ` Mike Frysinger
2021-04-09 17:18 ` Tom Tromey
2021-04-09 22:45 ` Mike Frysinger
2021-04-21 23:14 ` Tom Tromey
2021-04-22 3:17 ` Mike Frysinger
2021-04-22 14:14 ` Tom Tromey
2021-04-08 20:33 ` Tom Tromey [this message]
2021-04-11 17:50 ` [PATCH 05/10] Remove and modernize dependencies in sim Mike Frysinger
2021-04-22 14:15 ` Tom Tromey
2021-04-23 0:44 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 06/10] Remove INCLUDE variable from some sim Makefiles Tom Tromey
2021-04-09 0:27 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 07/10] Remove LIBS from two " Tom Tromey
2021-04-09 0:27 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 08/10] Define autoconf substitution variables early in Make-common.in Tom Tromey
2021-04-09 0:44 ` Mike Frysinger
2021-04-08 20:33 ` [PATCH 09/10] Use prologue and epilogue Makefile fragments Tom Tromey
2021-04-08 20:33 ` [PATCH 10/10] Do not check for sys/time.h or sys/times.h Tom Tromey
2021-04-09 0:35 ` Mike Frysinger
2021-04-09 17:18 ` Tom Tromey
2021-04-09 0:26 ` [PATCH 00/10] sim build improvements Mike Frysinger
2021-04-09 17:14 ` Tom Tromey
2021-04-09 22:27 ` Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210408203312.2938165-6-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).