From 6a8b86150e2ad521822b63f1839b320a749335ac Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Sun, 12 Jul 2009 16:59:34 +0000 Subject: * common/Make-common.in (CPU_DIR): Define. * iq2000/Makefile.in (stamp-arch): Use $(CPU_DIR) instead of $(CGEN_CPU_DIR). (stamp-cpu): Ditto. * m32r/Makefile.in (stamp-arch): Use $(CPU_DIR) instead of $(CGEN_CPU_DIR). (stamp-cpu, stamp-xcpu, stamp-2cpu): Ditto. --- sim/iq2000/ChangeLog | 5 +++++ sim/iq2000/Makefile.in | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'sim/iq2000') diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog index 2e418f0..67cb134 100644 --- a/sim/iq2000/ChangeLog +++ b/sim/iq2000/ChangeLog @@ -1,3 +1,8 @@ +2009-07-12 Doug Evans + + * Makefile.in (stamp-arch): Use $(CPU_DIR) instead of $(CGEN_CPU_DIR). + (stamp-cpu): Ditto. + 2009-07-07 Doug Evans * Makefile.in (stamp-arch): Pass archfile to cgen-arch. diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in index e6fd16c..ad12b0e 100644 --- a/sim/iq2000/Makefile.in +++ b/sim/iq2000/Makefile.in @@ -92,18 +92,18 @@ 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) $(CGEN_CPU_DIR)/iq2000.cpu Makefile +stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/iq2000.cpu Makefile $(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=iq2000 \ - archfile=$(CGEN_CPU_DIR)/iq2000.cpu \ + archfile=$(CPU_DIR)/iq2000.cpu \ FLAGS="with-scache with-profile=fn" touch stamp-arch arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch @true -stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/iq2000.cpu Makefile +stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/iq2000.cpu Makefile $(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \ cpu=iq2000bf mach=iq2000 \ - archfile=$(CGEN_CPU_DIR)/iq2000.cpu \ + archfile=$(CPU_DIR)/iq2000.cpu \ FLAGS="with-scache with-profile=fn" \ EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)" touch stamp-cpu -- cgit v1.1