X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-host-2.sh;h=0321ad33d943ad91c3a35539e6eec6bcf1a333ff;hb=b5791569082496e3bc4db6254c870c0bc994e19a;hp=59afc86ed14954a48aba963c3ca1de9fb3c05ba8;hpb=34dd23563d2f5cf05c72b971da0d0b065a09bf2a;p=sbcl.git

diff --git a/make-host-2.sh b/make-host-2.sh
index 59afc86..0321ad3 100644
--- a/make-host-2.sh
+++ b/make-host-2.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 # This is a script to be run as part of make.sh. The only time you'd
 # want to run it by itself is if you're trying to cross-compile the
@@ -15,6 +16,10 @@
 
 echo //entering make-host-2.sh
 
+LANG=C
+LC_ALL=C
+export LANG LC_ALL
+
 # In some cases, a debugging build of the system will creates a core
 # file output/after-xc.core in the next step. In cases where it
 # doesn't, it's confusing and basically useless to have any old copies
@@ -40,7 +45,7 @@ rm -f output/after-xc.core
 # the fasl files into the new host Lisp, and that doesn't seem to be
 # an enormously important disadvantage, either.)
 echo //running cross-compiler to create target object files
-$SBCL_XC_HOST <<-'EOF' || exit 1
+$SBCL_XC_HOST <<-'EOF'
 
         ;;;
         ;;; Set up the cross-compiler.
@@ -55,15 +60,27 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
 	(load-or-cload-xcompiler #'host-load-stem)
         (defun proclaim-target-optimization ()
           (let ((debug (if (position :sb-show *shebang-features*) 2 1)))
-	    (sb-xc:proclaim `(optimize (compilation-speed 1)
-	                               (debug ,debug)
-				       (sb!ext:inhibit-warnings 2)
-                                       (safety 3)
-                                       (space 1)
-				       (speed 2)))))
+	    (sb-xc:proclaim 
+             `(optimize
+	       (compilation-speed 1)
+	       (debug ,debug)
+	       ;; CLISP's pretty-printer is fragile and tends to cause
+	       ;; stack corruption or fail internal assertions, as of
+	       ;; 2003-04-20; we therefore turn off as many notes as
+	       ;; possible.
+	       (sb!ext:inhibit-warnings #-clisp 2
+		                        #+clisp 3)
+	       ;; SAFETY = SPEED (and < 3) should provide reasonable
+	       ;; safety, but might skip some unreasonably expensive
+	       ;; stuff (e.g. %DETECT-STACK-EXHAUSTION in sbcl-0.7.2).
+	       (safety 2)
+	       (space 1)
+	       (speed 2)
+               (sb!c:insert-step-conditions 0)
+               (sb!c::stack-allocate-dynamic-extent 3)))))
         (compile 'proclaim-target-optimization)
-	(defun in-target-cross-compilation-mode (fn)
-	  "Call FN with everything set up appropriately for cross-compiling
+	(defun in-target-cross-compilation-mode (fun)
+	  "Call FUN with everything set up appropriately for cross-compiling
 	  a target file."
 	  (let (;; In order to increase microefficiency of the target Lisp, 
 		;; enable old CMU CL defined-function-types-never-change
@@ -71,8 +88,6 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
 		;; redefine our functions anyway; and developers can
 		;; fend for themselves.)
 		#!-sb-fluid (sb!ext:*derive-function-types* t)
-		;; FIXME: *TOPLEVEL-LAMBDA-MAX* should go away altogether.
-		(sb!c::*toplevel-lambda-max* 1)
 		;; Let the target know that we're the cross-compiler.
 		(*features* (cons :sb-xc *features*))
 		;; We need to tweak the readtable..
@@ -87,10 +102,10 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
             (proclaim-target-optimization)
             ;; Specify where target machinery lives.
             (with-additional-nickname ("SB-XC" "SB!XC")
-              (funcall fn))))
+              (funcall fun))))
 	(compile 'in-target-cross-compilation-mode)
-	(setf *target-compile-file* 'sb-xc:compile-file)
-	(setf *target-assemble-file* 'sb!c:assemble-file)
+	(setf *target-compile-file* #'sb-xc:compile-file)
+	(setf *target-assemble-file* #'sb!c:assemble-file)
 	(setf *in-target-compilation-mode-fn*
 	      #'in-target-cross-compilation-mode)
 
@@ -104,7 +119,7 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
         ;;; 
 	(let ((filename "output/object-filenames-for-genesis.lisp-expr"))
 	  (ensure-directories-exist filename :verbose t)
-	  (with-open-file (s filename :direction :output)
+	  (with-open-file (s filename :direction :output :if-exists :supersede)
 	    (write *target-object-file-names* :stream s :readably t)))
         ;; Let's check that the type system was reasonably sane. (It's
 	;; easy to spend a long time wandering around confused trying
@@ -119,7 +134,11 @@ $SBCL_XC_HOST <<-'EOF' || exit 1
 	(when (position :sb-after-xc-core *shebang-features*)
           #+cmu (ext:save-lisp "output/after-xc.core" :load-init-file nil)
           #+sbcl (sb-ext:save-lisp-and-die "output/after-xc.core")
-	  )
+          #+openmcl (ccl::save-application "output/after-xc.core")
+          #+clisp (ext:saveinitmem "output/after-xc.core"))
+        #+cmu (ext:quit)
+        #+clisp (ext:quit)
+        #+abcl (ext:quit)
 	EOF
 
 # Run GENESIS (again) in order to create cold-sbcl.core. (The first