aboutsummaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/common/ChangeLog10
-rw-r--r--sim/common/Make-common.in14
-rw-r--r--sim/fr30/ChangeLog5
-rw-r--r--sim/fr30/Makefile.in4
-rw-r--r--sim/i960/ChangeLog6
-rw-r--r--sim/i960/Makefile.in6
-rw-r--r--sim/m32r/ChangeLog6
-rw-r--r--sim/m32r/Makefile.in6
8 files changed, 42 insertions, 15 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 1117307..0b94177 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-05 Ben Elliston <bje@redhat.com>
+
+ * Make-common.in (srccgen): Remove.
+ (CGEN_CPU_DIR): Define.
+ (CGEN_READ_SCM): Redefine without $(srccgen).
+ (CGEN_ARCH_SCM): Ditto.
+ (CGEN_CPU_SCM): Ditto.
+ (CGEN_DECODE_SCM): Ditto.
+ (CGEN_DESC_SCM): Ditto.
+
2001-04-25 Frank Ch. Eigler <fche@redhat.com>
* sim-load.c (sim_load_file): Put it back: external now.
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index f37d03f..519b213 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -1,5 +1,5 @@
# Makefile fragment for common parts of all simulators.
-# Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+# Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
# Contributed by Cygnus Support.
# This program is free software; you can redistribute it and/or modify
@@ -659,13 +659,13 @@ stamp-h: config.in config.status
CGENDIR = @cgendir@
CGEN = `if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi`
CGENFLAGS = -v
-srccgen = $(CGENDIR)
+CGEN_CPU_DIR = $(CGENDIR)/cpu
-CGEN_READ_SCM = ../../cgen/stamp-cgen $(srccgen)/sim.scm
-CGEN_ARCH_SCM = $(srccgen)/sim-arch.scm
-CGEN_CPU_SCM = $(srccgen)/sim-cpu.scm $(srccgen)/sim-model.scm
-CGEN_DECODE_SCM = $(srccgen)/sim-decode.scm
-CGEN_DESC_SCM = $(srccgen)/desc.scm $(srccgen)/desc-cpu.scm
+CGEN_READ_SCM = ../../cgen/stamp-cgen $(CGENDIR)/sim.scm
+CGEN_ARCH_SCM = $(CGENDIR)/sim-arch.scm
+CGEN_CPU_SCM = $(CGENDIR)/sim-cpu.scm $(CGENDIR)/sim-model.scm
+CGEN_DECODE_SCM = $(CGENDIR)/sim-decode.scm
+CGEN_DESC_SCM = $(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm
# Various choices for which cpu specific files to generate.
CGEN_CPU_EXTR = -E tmp-ext.c1
diff --git a/sim/fr30/ChangeLog b/sim/fr30/ChangeLog
index a8ea840..ed8f8af 100644
--- a/sim/fr30/ChangeLog
+++ b/sim/fr30/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-05 Ben Elliston <bje@redhat.com>
+
+ * Makefile.in (stamp-arch): Use $(CGEN_CPU_DIR).
+ (stamp-cpu): Likewise.
+
2001-03-05 Dave Brolley <brolley@redhat.com>
* arch.c: Regenerate.
diff --git a/sim/fr30/Makefile.in b/sim/fr30/Makefile.in
index 102cb0c..2a0ac83 100644
--- a/sim/fr30/Makefile.in
+++ b/sim/fr30/Makefile.in
@@ -94,13 +94,13 @@ 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) $(srccgen)/fr30.cpu
+stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/fr30.cpu
$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
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) $(srccgen)/fr30.cpu
+stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/fr30.cpu
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
cpu=fr30bf mach=fr30 SUFFIX= FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEM) $(CGEN_CPU_SEMSW)"
touch stamp-cpu
diff --git a/sim/i960/ChangeLog b/sim/i960/ChangeLog
index 9b73dfa..8cd8512 100644
--- a/sim/i960/ChangeLog
+++ b/sim/i960/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-05 Ben Elliston <bje@redhat.com>
+
+ * Makefile.in (stamp-arch): Use $(CGEN_CPU_DIR).
+ (stamp-cpu): Likewise.
+ (stamp-desc): Likewise.
+
2001-02-06 DJ Delorie <dj@redhat.com>
* i960-desc.c: Update all the A macro definitions to the new
diff --git a/sim/i960/Makefile.in b/sim/i960/Makefile.in
index 0059e23..b1e0abe 100644
--- a/sim/i960/Makefile.in
+++ b/sim/i960/Makefile.in
@@ -105,20 +105,20 @@ 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) $(srccgen)/i960.cpu
+stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/i960.cpu
$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
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) $(srccgen)/i960.cpu
+stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/i960.cpu
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
cpu=i960base mach=i960:ka_sa,i960:ca SUFFIX= 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-desc: $(CGEN_READ_SCM) $(CGEN_DESC_SCM) \
- $(srccgen)/sparc.cpu $(srccgen)/sparccom.cpu $(srccgen)/i960.cpu $(srccgen)/i960.cpu
+ $(CGEN_CPU_DIR)/sparc.cpu $(CGEN_CPU_DIR)/sparccom.cpu $(CGEN_CPU_DIR)/i960.cpu $(CGEN_CPU_DIR)/i960.cpu
$(MAKE) cgen-desc $(CGEN_FLAGS_TO_PASS) \
cpu=i960 mach=all
touch stamp-desc
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index ed2cb34..3fe36f5 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-05 Ben Elliston <bje@redhat.com>
+
+ * Makefile.in (stamp-arch): Use $(CGEN_CPU_DIR).
+ (stamp-cpu): Likewise.
+ (stamp-xcpu): Likewise.
+
2001-03-05 Dave Brolley <brolley@redhat.com>
arch.c: Regenerate.
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 0c2bf6f..7f40a85 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -124,13 +124,13 @@ 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) $(srccgen)/m32r.cpu
+stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CGEN_CPU_DIR)/m32r.cpu
$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
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) $(srccgen)/m32r.cpu
+stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/m32r.cpu
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
cpu=m32rbf mach=m32r SUFFIX= \
FLAGS="with-scache with-profile=fn" \
@@ -138,7 +138,7 @@ stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(srccgen)/m32r.c
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) $(srccgen)/m32r.cpu
+stamp-xcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/m32r.cpu
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
cpu=m32rxf mach=m32rx SUFFIX=x FLAGS="with-scache with-profile=fn" EXTRAFILES="$(CGEN_CPU_SEMSW)"
touch stamp-xcpu
generated by cgit v1.1 at 2024-12-13 20:37:33 +0000