diff options
Diffstat (limited to 'sim/m32r')
| -rw-r--r-- | sim/m32r/ChangeLog | 10 | ||||
| -rw-r--r-- | sim/m32r/Makefile.in | 38 |
2 files changed, 33 insertions, 15 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 33b1780..3dd0c58 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,13 @@ +2009-11-03 Doug Evans <dje@sebabeach.org> + + * Makefile.in (mloop.c): Add @true to rule. + (mloopx.c, mloop2.c): Ditto. + (stamp-*): Add Makefile dependency. + (arch.c, arch.h, cpuall.h): Specify full path. + (cpu.h, sem.c, sem-switch.c, model.c, decode.c, decode.h): Ditto. + (cpux.h, semx-switch.c, modelx.c, decodex.c, decodex.h): Ditto. + (cpu2.h, sem2-switch.c, model2.c, decode2.c, decode2.h): Ditto. + 2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * config.in: Regenerate. diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in index 51586fb..be55119 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -79,7 +79,7 @@ M32RBF_INCLUDE_DEPS = \ m32r.o: m32r.c $(M32RBF_INCLUDE_DEPS) # FIXME: Use of `mono' is wip. -mloop.c eng.h: stamp-mloop +mloop.c eng.h: stamp-mloop ; @true stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -fast -pbb -switch sem-switch.c \ @@ -103,7 +103,7 @@ M32RXF_INCLUDE_DEPS = \ m32rx.o: m32rx.c $(M32RXF_INCLUDE_DEPS) # FIXME: Use of `mono' is wip. -mloopx.c engx.h: stamp-xmloop +mloopx.c engx.h: stamp-xmloop ; @true stamp-xmloop: $(srcdir)/../common/genmloop.sh mloopx.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -no-fast -pbb -parallel-write -switch semx-switch.c \ @@ -128,7 +128,7 @@ M32R2F_INCLUDE_DEPS = \ m32r2.o: m32r2.c $(M32R2F_INCLUDE_DEPS) # FIXME: Use of `mono' is wip. -mloop2.c eng2.h: stamp-2mloop +mloop2.c eng2.h: stamp-2mloop ; @true stamp-2mloop: $(srcdir)/../common/genmloop.sh mloop2.in Makefile $(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \ -mono -no-fast -pbb -parallel-write -switch sem2-switch.c \ @@ -138,11 +138,11 @@ 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 sem2-switch.c $(M32R2F_INCLUDE_DEPS) -cpu2.o: cpu2.c $(M32R2F_INCLUDE_DEPS) +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) +sem2.o: sem2.c $(M32R2F_INCLUDE_DEPS) +model2.o: model2.c $(M32R2F_INCLUDE_DEPS) m32r-clean: rm -f mloop.c eng.h stamp-mloop @@ -156,36 +156,44 @@ CGEN_MAINT = ; @true # The following line is commented in or out depending upon --enable-cgen-maint. @CGEN_MAINT@CGEN_MAINT = -stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/m32r.cpu +# NOTE: Generated source files are specified as full paths, +# e.g. $(srcdir)/arch.c, because make may decide the files live +# in objdir otherwise. + +stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/m32r.cpu Makefile $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \ archfile=$(CPU_DIR)/m32r.cpu \ FLAGS="with-scache with-profile=fn" touch stamp-arch -arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch +$(srcdir)/arch.h $(srcdir)/arch.c $(srcdir)/cpuall.h: $(CGEN_MAINT) stamp-arch + @true -stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu +stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ cpu=m32rbf mach=m32r SUFFIX= \ archfile=$(CPU_DIR)/m32r.cpu \ FLAGS="with-scache with-profile=fn" \ EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)" touch stamp-cpu -cpu.h sem.c sem-switch.c model.c decode.c decode.h: $(CGEN_MAINT) stamp-cpu +$(srcdir)/cpu.h $(srcdir)/sem.c $(srcdir)/sem-switch.c $(srcdir)/model.c $(srcdir)/decode.c $(srcdir)/decode.h: $(CGEN_MAINT) stamp-cpu + @true -stamp-xcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu +stamp-xcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ cpu=m32rxf mach=m32rx SUFFIX=x \ archfile=$(CPU_DIR)/m32r.cpu \ FLAGS="with-scache with-profile=fn" \ EXTRAFILES="$(CGEN_CPU_SEMSW)" touch stamp-xcpu -cpux.h semx-switch.c modelx.c decodex.c decodex.h: $(CGEN_MAINT) stamp-xcpu +$(srcdir)/cpux.h $(srcdir)/semx-switch.c $(srcdir)/modelx.c $(srcdir)/decodex.c $(srcdir)/decodex.h: $(CGEN_MAINT) stamp-xcpu + @true -stamp-2cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu +stamp-2cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ cpu=m32r2f mach=m32r2 SUFFIX=2 \ archfile=$(CPU_DIR)/m32r.cpu \ FLAGS="with-scache with-profile=fn" \ EXTRAFILES="$(CGEN_CPU_SEMSW)" touch stamp-2cpu -cpu2.h sem2-switch.c model2.c decode2.c decode2.h: $(CGEN_MAINT) stamp-2cpu +$(srcdir)/cpu2.h $(srcdir)/sem2-switch.c $(srcdir)/model2.c $(srcdir)/decode2.c $(srcdir)/decode2.h: $(CGEN_MAINT) stamp-2cpu + @true |