cgen/ChangeLog:

2005-02-09  Jim Blandy  <jimb@redhat.com>

	* cgen-sim.scm (load-files): Don't load fixup.scm.  (See
	corresponding change in the sim/common directory.)

sim/common/ChangeLog:
2005-02-09  Jim Blandy  <jimb@redhat.com>

	* Make-common.in (CGEN): Load guile.scm, and include a trailing
	'-s' argument.
	(CGEN_FLAGS_TO_PASS): Include single quotes around the reference
	to $(CGEN), to ensure that the command substitution happens where
	the variable is referenced in the submake, not when the submake's
	arguments are expanded.
	(cgen.sh): Be prepared for the 'cgen' argument to contain spaces.
	(arch, cpu, decode, cpu-decode, defs, desc): Place the name of the
	application Scheme script directly after ${cgen}; don't precede it
	with a -s.

diff --git a/ChangeLog b/ChangeLog
index 8185f36d179fa9ecb5991c6cc5a5978e73fc90dc..2c02aeb144a590471722b984a11439c0fdb09265 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-09  Jim Blandy  <jimb@redhat.com>
+
+       * cgen-sim.scm (load-files): Don't load fixup.scm.  (See
+       corresponding change in the sim/common directory.)
+
 2005-02-07  Jim Blandy  <jimb@redhat.com>
 
        * cgen-opc.scm: Don't load fixup.scm here.  (See corresponding

diff --git a/cgen-sim.scm b/cgen-sim.scm
index e40f87567d90f72b0ddfc59b818b4b2b16305cc9..d6f69344016c88712ffc5ab82dba4dec06a116d9 100644 (file)
--- a/cgen-sim.scm
+++ b/cgen-sim.scm
@@ -13,9 +13,6 @@
 ; Load the various support routines.
 
 (define (load-files srcdir)
-  ; Fix up Scheme to be what we use (guile is always in flux).
-  (primitive-load-path (string-append srcdir "/fixup.scm"))
-
   (load (string-append srcdir "/read.scm"))
   (load (string-append srcdir "/utils-sim.scm"))
   (load (string-append srcdir "/sim.scm"))