From 0a40490e6aa43a28c471f4db8a18a4820cbf58c3 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 8 Feb 2005 04:52:24 +0000 Subject: [PATCH] cgen/ChangeLog: 2005-02-07 Jim Blandy * cgen-opc.scm: Don't load fixup.scm here. (See corresponding changes in the opcodes directory.) opcodes/ChangeLog: 2005-02-07 Jim Blandy * 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. --- opcodes/ChangeLog | 10 ++++++++++ opcodes/Makefile.am | 2 +- opcodes/Makefile.in | 2 +- opcodes/cgen.sh | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3cd146727d5..7c06b8f91be 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,13 @@ +2005-02-07 Jim Blandy + + * 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 * configure: Regenerate to track ../gettext.m4. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 36df7d951af..2176b43d5b0 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -357,7 +357,7 @@ CLEANFILES = \ 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 = \ diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index dfbdac8bfb2..9f929968e8a 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -532,7 +532,7 @@ CLEANFILES = \ 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 \ diff --git a/opcodes/cgen.sh b/opcodes/cgen.sh index 5a340b6e527..bafc8f449b9 100644 --- a/opcodes/cgen.sh +++ b/opcodes/cgen.sh @@ -47,7 +47,7 @@ set -e action=$1 srcdir=$2 -cgen=$3 +cgen="$3" cgendir=$4 cgenflags=$5 arch=$6 @@ -93,7 +93,7 @@ opcodes) 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}" \ -- 2.30.2