Tweak native rules so they work for svm too.

diff --git a/src/Makefile.boot.in b/src/Makefile.boot.in
index f12095a9257618071e30b603fb43fe08ca09e7f8..924e9b8989fbd3ab8847db6446635c6a4b4981f9 100644 (file)
--- a/src/Makefile.boot.in
+++ b/src/Makefile.boot.in
@@ -189,11 +189,16 @@ compile-cross-compiler-rtlopt: syntax-cross-compiler
 # do the wrong thing if there is already a compiler loaded into the
 # image.
 .PHONY: syntax-cross-compiler
+@IF_SVM@syntax-cross-compiler: compiler/machines/svm/assembler-db.scm
 syntax-cross-compiler: cref-cross-compiler
        (echo '(with-working-directory-pathname "compiler"' && \
         echo '  (lambda () (load "compiler.sf")))') \
        | $(HOST_SYNTAXER)
 
+compiler/machines/svm/assembler-db.scm:
+       (cd compiler/machines/svm && \
+        '$(MIT_SCHEME_EXE)' --batch-mode --load compile-assembler </dev/null)
+
 .PHONY: cref-cross-compiler
 cref-cross-compiler: cref-cross-cref
 cref-cross-compiler: cref-cross-sf

diff --git a/src/Makefile.in b/src/Makefile.in
index 4e82512c1ddd0211e8a3303c2a77ba7e2fc74d1e..9a37b055ad6034a89c487c9499a3d59fd4d6eb4b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -113,7 +113,9 @@ boot/compiler.com:
 boot/syntaxer.com:
        @echo >&2 'Please run `make -f Makefile.boot'\'' first.'; exit 1
 
-microcode/scheme: compile-microcode
+@IF_SVM@microcode/scheme: microcode/svm1-defns.h
+microcode/scheme:
+       (cd microcode && $(MAKE) all)
 
 lib/runtime.com: compile-runtime
 @IF_CROSS@lib/runtime.com: cross-end
@@ -232,6 +234,7 @@ compile-compiler-rtlopt: syntax-compiler
 
 .PHONY: syntax-compiler
 syntax-compiler: bootstrap-toolchain
+@IF_SVM@syntax-compiler: compiler/machines/svm/svm1-defns.h
 syntax-compiler: cref-compiler
        (echo '(with-working-directory-pathname "compiler"' && \
         echo '  (lambda () (load "compiler.sf")))') \

diff --git a/src/configure.ac b/src/configure.ac
index e75833cf9168edc9d299f93c3bd728a478d885c0..6b3e8ddfde9d6b1db588b20f02e453ff145b86f4 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -82,16 +82,19 @@ c)
     ALL_TARGET=all-liarc
     INSTALL_COM=:
     INSTALL_LIARC_BUNDLES=install-liarc-bundles
+    IF_SVM=\#
     ;;
 svm1)
     ALL_TARGET=all-svm
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
+    IF_SVM=
     ;;
 *)
     ALL_TARGET=all-native
     INSTALL_COM='$(INSTALL_DATA)'
     INSTALL_LIARC_BUNDLES=
+    IF_SVM=\#
     ;;
 esac
 AUXDIR_NAME=mit-scheme-${mit_scheme_native_code}