diff options
| author | Jim Blandy <jimb@codesourcery.com> | 2005-02-09 22:04:04 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@codesourcery.com> | 2005-02-09 22:04:04 +0000 |
| commit | 9ab46d53980f2776405d56741d7f33e4adc3ead6 (patch) | |
| tree | 0a168ada951d9dfe159963313cabdbe6c825cabf /sim | |
| parent | 11dced61197b04a2a9653e6718dd939ebd63b077 (diff) | |
| download | fsf-binutils-gdb-9ab46d53980f2776405d56741d7f33e4adc3ead6.zip fsf-binutils-gdb-9ab46d53980f2776405d56741d7f33e4adc3ead6.tar.gz fsf-binutils-gdb-9ab46d53980f2776405d56741d7f33e4adc3ead6.tar.bz2 | |
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.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/common/ChangeLog | 13 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 4 | ||||
| -rw-r--r-- | sim/common/cgen.sh | 10 |
3 files changed, 20 insertions, 7 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 668ff47..b7d62cd 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,16 @@ +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. + 2005-01-28 Hans-Peter Nilsson <hp@axis.com> * syscall.c (cb_syscall) <case CB_SYS_pipe>: New case. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index ee72b42..edcb1d2 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -682,7 +682,7 @@ stamp-h: config.in config.status # CGEN support CGENDIR = @cgendir@ -CGEN = `if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` +CGEN = "`if [ -f ../../guile/libguile/guile ]; then echo ../../guile/libguile/guile; else echo guile ; fi` -l $(CGENDIR)/guile.scm -s" CGENFLAGS = -v CGEN_CPU_DIR = $(CGENDIR)/cpu @@ -700,7 +700,7 @@ CGEN_CPU_SEM = -S tmp-sem.c1 CGEN_CPU_SEMSW = -X tmp-semsw.c1 CGEN_FLAGS_TO_PASS = \ - CGEN=$(CGEN) \ + CGEN='$(CGEN)' \ CGENFLAGS="$(CGENFLAGS)" # We store the generated files in the source directory until we decide to diff --git a/sim/common/cgen.sh b/sim/common/cgen.sh index 8718835..b1ed32a 100644 --- a/sim/common/cgen.sh +++ b/sim/common/cgen.sh @@ -14,7 +14,7 @@ set -e action=$1 srcdir=$2 -cgen=$3 +cgen="$3" cgendir=$4 cgenflags=$5 arch=$6 @@ -56,7 +56,7 @@ arch) rm -f tmp-arch.c1 tmp-arch.c rm -f tmp-all.h1 tmp-all.h - ${cgen} -s ${cgendir}/cgen-sim.scm \ + ${cgen} ${cgendir}/cgen-sim.scm \ -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ @@ -110,7 +110,7 @@ cpu | decode | cpu-decode) ;; esac - ${cgen} -s ${cgendir}/cgen-sim.scm \ + ${cgen} ${cgendir}/cgen-sim.scm \ -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ @@ -179,7 +179,7 @@ cpu | decode | cpu-decode) defs) rm -f tmp-defs.h1 tmp-defs.h - ${cgen} -s ${cgendir}/cgen-sim.scm \ + ${cgen} ${cgendir}/cgen-sim.scm \ -s ${cgendir} \ ${cgenflags} \ -f "${archflags}" \ @@ -196,7 +196,7 @@ desc) rm -f tmp-desc.c1 tmp-desc.c rm -f tmp-opc.h1 tmp-opc.h - ${cgen} -s ${cgendir}/cgen-opc.scm \ + ${cgen} ${cgendir}/cgen-opc.scm \ -s ${cgendir} \ ${cgenflags} \ -OPC ${opcfile} \ |