* 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.
This commit is contained in:
parent
5a12aa1e46
commit
6a8b86150e
@ -1,3 +1,7 @@
|
||||
2009-07-07 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* Make-common.in (CPU_DIR): Define.
|
||||
|
||||
2009-07-06 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* Make-common.in (CGEN_CPU_EXTR,CGEN_CPU_READ): Pass canonical
|
||||
|
@ -694,6 +694,9 @@ CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/gu
|
||||
CGENFLAGS = -v
|
||||
CGEN_CPU_DIR = $(CGENDIR)/cpu
|
||||
|
||||
# Most ports use the files here instead of cgen/cpu.
|
||||
CPU_DIR = $(srcroot)/cpu
|
||||
|
||||
CGEN_READ_SCM = $(CGENDIR)/sim.scm
|
||||
CGEN_ARCH_SCM = $(CGENDIR)/sim-arch.scm
|
||||
CGEN_CPU_SCM = $(CGENDIR)/sim-cpu.scm $(CGENDIR)/sim-model.scm
|
||||
|
@ -1,3 +1,8 @@
|
||||
2009-07-12 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* Makefile.in (stamp-arch): Use $(CPU_DIR) instead of $(CGEN_CPU_DIR).
|
||||
(stamp-cpu): Ditto.
|
||||
|
||||
2009-07-07 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* Makefile.in (stamp-arch): Pass archfile to cgen-arch.
|
||||
|
@ -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
|
||||
|
@ -1,3 +1,8 @@
|
||||
2009-07-12 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* Makefile.in (stamp-arch): Use $(CPU_DIR) instead of $(CGEN_CPU_DIR).
|
||||
(stamp-cpu, stamp-xcpu, stamp-2cpu): Ditto.
|
||||
|
||||
2009-06-20 Doug Evans <dje@sebabeach.org>
|
||||
|
||||
* mloop.in: Add missing # comment marker.
|
||||
|
@ -156,35 +156,35 @@ 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)/m32r.cpu
|
||||
stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/m32r.cpu
|
||||
$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
|
||||
archfile=$(CGEN_CPU_DIR)/m32r.cpu \
|
||||
archfile=$(CPU_DIR)/m32r.cpu \
|
||||
FLAGS="with-scache with-profile=fn"
|
||||
touch stamp-arch
|
||||
arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch
|
||||
|
||||
stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/m32r.cpu
|
||||
stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu
|
||||
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
|
||||
cpu=m32rbf mach=m32r SUFFIX= \
|
||||
archfile=$(CGEN_CPU_DIR)/m32r.cpu \
|
||||
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
|
||||
|
||||
stamp-xcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/m32r.cpu
|
||||
stamp-xcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu
|
||||
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
|
||||
cpu=m32rxf mach=m32rx SUFFIX=x \
|
||||
archfile=$(CGEN_CPU_DIR)/m32r.cpu \
|
||||
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
|
||||
|
||||
stamp-2cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/m32r.cpu
|
||||
stamp-2cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CPU_DIR)/m32r.cpu
|
||||
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
|
||||
cpu=m32r2f mach=m32r2 SUFFIX=2 \
|
||||
archfile=$(CGEN_CPU_DIR)/m32r.cpu \
|
||||
archfile=$(CPU_DIR)/m32r.cpu \
|
||||
FLAGS="with-scache with-profile=fn" \
|
||||
EXTRAFILES="$(CGEN_CPU_SEMSW)"
|
||||
touch stamp-2cpu
|
||||
|
Loading…
x
Reference in New Issue
Block a user