commit 13b5bca2b7981cf00afb8308a73aa5adfa34548d
Author: Matt Birkholz <[email protected]>
Date: Sat Oct 12 18:17:44 2013 -0700
Fix new build to cross from 9.1.1.
Unlike a cross compile, a cross runtime was not used by this build(?).
Use a new compile-cross-runtime target and --fasl make.com to make
tools/syntaxer.com.
Please back out this change. The structure I put in place, where the
cross-compiler and cross-syntaxer run in the host runtime and not in
the target runtime, is absolutely intentional, and necessary to get a
sane bootstrap and sane cross-build.
The target called cref-kludgerous-runtime was so named because nothing
in Makefile.tools should refer to runtime/, but currently there's no
way to refer to the host Scheme's runtime-*.pkd. To work around that,
we pretend that the target Scheme's runtime.pkg describes the host's
runtime accurately enough for compiler, cref, sf, and star-parser.
The correct fix to the problem you observed is attached.
diff --git a/src/compiler/fggen/canon.scm b/src/compiler/fggen/canon.scm
index 62db01a..5cf836e 100644
--- a/src/compiler/fggen/canon.scm
+++ b/src/compiler/fggen/canon.scm
@@ -819,7 +819,7 @@ ARBITRARY: The expression may be executed more than once.
It
((dispatch-entry
(sc-macro-transformer
(lambda (form environment)
- `(VECTOR-SET! DISPATCH-VECTOR ,(microcode-type (cadr form))
+ `(VECTOR-SET! DISPATCH-VECTOR (MICROCODE-TYPE ',(cadr form))
,(close-syntax (caddr form) environment)))))
(dispatch-entries
diff --git a/src/compiler/fggen/fggen.scm b/src/compiler/fggen/fggen.scm
index a9f6cad..49117db 100644
--- a/src/compiler/fggen/fggen.scm
+++ b/src/compiler/fggen/fggen.scm
@@ -962,7 +962,7 @@ USA.
(sc-macro-transformer
(lambda (form environment)
`(VECTOR-SET! DISPATCH-VECTOR
- ,(microcode-type (cadr form))
+ (MICROCODE-TYPE ',(cadr form))
,(close-syntax (caddr form) environment)))))
(dispatch-entries
(sc-macro-transformer
_______________________________________________
MIT-Scheme-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/mit-scheme-devel
