* sim/cris/asm/movmp8.ms, sim/cris/asm/pcplus.ms: New tests.

[deliverable/binutils-gdb.git] / sim / cris / Makefile.in

diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index 0e9af581d4a57f9b517c77dea21ec963e396a5ba..85af034c218115c44c8e2d615ef74e50b53dfe5d 100644 (file)
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -103,7 +103,9 @@ 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
-stamp-v32fmloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
+# We depend on stamp-v10fmloop to get serialization to avoid
+# racing with it for the same temporary file-names when "make -j".
+stamp-v32fmloop: stamp-v10fmloop $(srcdir)/../common/genmloop.sh mloop.in Makefile
        $(SHELL) $(srccom)/genmloop.sh \
                -mono -no-fast -pbb -switch semcrisv32f-switch.c \
                -cpu crisv32f -infile $(srcdir)/mloop.in
@@ -140,11 +142,14 @@ stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile
        touch stamp-arch
 arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch
 
+# The sed-hack is supposed to be temporary, until we get CGEN to emit it.
 stamp-v10fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/cris.cpu Makefile
        $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
          archfile=$(CGEN_CPU_DIR)/cris.cpu \
          cpu=crisv10f mach=crisv10 SUFFIX=v10 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"
        $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv10-switch.c $(srcdir)/semcrisv10f-switch.c
+       sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev10.c > decodev10.c.tmp
+       mv decodev10.c.tmp $(srcdir)/decodev10.c
        touch stamp-v10fcpu
 cpuv10.h cpuv10.c semcrisv10f-switch.c modelv10.c decodev10.c decodev10.h: $(CGEN_MAINT) stamp-v10fcpu
 
@@ -153,6 +158,8 @@ stamp-v32fcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DI
          archfile=$(CGEN_CPU_DIR)/cris.cpu \
          cpu=crisv32f mach=crisv32 SUFFIX=v32 FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"
        $(SHELL) $(srcroot)/move-if-change $(srcdir)/semv32-switch.c $(srcdir)/semcrisv32f-switch.c
+       sed -ne 'p; s/^\(#include "sim-assert.h"\)$$/#include "cgen-ops.h"/p' < $(srcdir)/decodev32.c > decodev32.c.tmp
+       mv decodev32.c.tmp $(srcdir)/decodev32.c
        touch stamp-v32fcpu
 cpuv32.h cpuv32.c semcrisv32f-switch.c modelv32.c decodev32.c decodev32.h: $(CGEN_MAINT) stamp-v32fcpu