aboutsummaryrefslogtreecommitdiff
path: root/sim/bpf
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/bpf
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/bpf')
-rw-r--r--sim/bpf/ChangeLog7
-rw-r--r--sim/bpf/Makefile.in38
2 files changed, 23 insertions, 22 deletions
diff --git a/sim/bpf/ChangeLog b/sim/bpf/ChangeLog
index 0509ae5..47fb5a7 100644
--- a/sim/bpf/ChangeLog
+++ b/sim/bpf/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2021-04-21 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4: Regenerate.
diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in
index 8052a90..abc89fe 100644
--- a/sim/bpf/Makefile.in
+++ b/sim/bpf/Makefile.in
@@ -35,6 +35,7 @@ SIM_EXTRA_DEPS = \
$(CGEN_INCLUDE_DEPS) \
arch.h \
bpf-sim.h \
+ eng-le.h eng-be.h \
$(srcdir)/../../opcodes/bpf-desc.h \
$(srcdir)/../../opcodes/bpf-opc.h
@@ -60,33 +61,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