Eliminate COMPILE-BOOTSTRAP-3 by moving its contents into C-PREPARE

and NATIVE-PREPARE, each of which needs more specific initialization.

diff --git a/v7/src/etc/c-prepare.sh b/v7/src/etc/c-prepare.sh
index b65228d10b4f3ffea6b82ea6928aa80baff65587..83e891fa7aaafa6261a2036f0a906422c9086569 100755 (executable)
--- a/v7/src/etc/c-prepare.sh
+++ b/v7/src/etc/c-prepare.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: c-prepare.sh,v 1.8 2007/06/09 01:19:14 cph Exp $
+# $Id: c-prepare.sh,v 1.9 2007/06/09 02:38:00 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -37,6 +37,5 @@ echo "${CMD}"
 ${CMD} <<EOF
 (begin
   (load "etc/compile.scm")
-  (compile-bootstrap-3)
   (c-prepare))
 EOF

diff --git a/v7/src/etc/compile.scm b/v7/src/etc/compile.scm
index efda6a45ec1519596a9588a8e02d334e0abb4303..7ca933008d1c5a995386811d24409c0a452d6b9d 100644 (file)
--- a/v7/src/etc/compile.scm
+++ b/v7/src/etc/compile.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: compile.scm,v 1.22 2007/06/09 01:19:57 cph Exp $
+$Id: compile.scm,v 1.23 2007/06/09 02:37:54 cph Exp $
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -78,22 +78,22 @@ USA.
        (in-liarc action)
        (action))))
 
-(define (compile-bootstrap-3)
+(define (c-prepare)
   (load-option 'SF)
   (with-working-directory-pathname "compiler"
     (lambda ()
-      (if (and (eq? microcode-id/compiled-code-type 'C)
-              (file-exists? "compiler.so"))
-         (load "compiler.so"))
-      (load "make"))))
-
-(define (c-prepare)
+      (load "make")))
   (in-liarc
    (lambda ()
      (compile-boot-dirs c-compile-dir)
      (cf "microcode/utabmd"))))
 
 (define (native-prepare)
+  (load-option 'SF)
+  (with-working-directory-pathname "compiler"
+    (lambda ()
+      (load "compiler.so")
+      (load "machines/i386/make")))
   (compile-boot-dirs compile-dir)
   (sf "microcode/utabmd"))
 

diff --git a/v7/src/etc/native-prepare.sh b/v7/src/etc/native-prepare.sh
index 89e3a997a2901f9b048f97daf502befd66cc2085..1d5bb61f14b243583e2c7c7095ce683b3e2d40af 100755 (executable)
--- a/v7/src/etc/native-prepare.sh
+++ b/v7/src/etc/native-prepare.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: native-prepare.sh,v 1.1 2007/06/06 19:42:39 cph Exp $
+# $Id: native-prepare.sh,v 1.2 2007/06/09 02:38:06 cph Exp $
 #
 # Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
 #     1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -31,12 +31,11 @@ else
     echo "usage: ${0} <executable>"
     exit 1
 fi
-CMD="${EXE} --heap 6000"
+CMD="${EXE} --heap 6000 --stack 200"
 
 echo "${CMD}"
 ${CMD} <<EOF
 (begin
   (load "etc/compile.scm")
-  (compile-bootstrap-3)
   (native-prepare))
 EOF