2005-02-07 Jim Blandy <jimb@redhat.com>
+ * cgen-opc.scm: Don't load fixup.scm here. (See corresponding
+ changes in the opcodes directory.)
+
* guile.scm: New file, containing Guile-specific definitions and
adaptations. This is loaded by the app-specific shell scripts.
Initially identical to fixup.scm.
; 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 "/desc.scm"))
(load (string-append srcdir "/desc-cpu.scm"))
+2005-02-07 Jim Blandy <jimb@redhat.com>
+
+ * Makefile.am (CGEN): Load guile.scm before calling the main
+ application script.
+ * Makefile.in: Regenerated.
+ * cgen.sh: Be prepared for the 'cgen' argument to contain spaces.
+ Simply pass the cgen-opc.scm path to ${cgen} as its first
+ argument; ${cgen} itself now contains the '-s', or whatever is
+ appropriate for the Scheme being used.
+
2005-01-31 Andrew Cagney <cagney@gnu.org>
* configure: Regenerate to track ../gettext.m4.
CGENDIR = @cgendir@
CPUDIR = $(CGENDIR)/cpu
-CGEN = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
CGENDIR = @cgendir@
CPUDIR = $(CGENDIR)/cpu
-CGEN = `if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi`
+CGEN = "`if test -f ../guile/libguile/guile ; then echo ../guile/libguile/guile; else echo guile ; fi` -l ${cgendir}/guile.scm -s"
CGENFLAGS = -v
CGENDEPS = \
$(CGENDIR)/desc.scm $(CGENDIR)/desc-cpu.scm \
action=$1
srcdir=$2
-cgen=$3
+cgen="$3"
cgendir=$4
cgenflags=$5
arch=$6
rm -f tmp-dis.c tmp-dis.in1
# Run CGEN.
- ${cgen} -s ${cgendir}/cgen-opc.scm \
+ ${cgen} ${cgendir}/cgen-opc.scm \
-s ${cgendir} \
${cgenflags} \
-f "${options}" \