X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=make-host-2.sh;h=341389890197703578ac9a0b8c5f1472ce31d7d8;hb=HEAD;hp=63e4512a1fb9d428929117b16c47a700ce0a8b1a;hpb=334af30b26555f0bf706f7157b399bdbd4fad548;p=sbcl.git diff --git a/make-host-2.sh b/make-host-2.sh index 63e4512..3413898 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,19 @@ echo //entering make-host-2.sh +LANG=C +LC_ALL=C +export LANG LC_ALL + +# Load our build configuration +. output/build-config + +# 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 +# lying around, so delete: +rm -f output/after-xc.core + # In a fresh host Lisp invocation, load and run the cross-compiler to # create the target object files describing the target SBCL. # @@ -23,7 +37,7 @@ echo //entering make-host-2.sh # that we used to compile it: # (1) It reduces the chance that the cross-compilation process # inadvertently comes to depend on some weird compile-time -# side-effect. +# side effect. # (2) It reduces peak memory demand (because definitions wrapped in # (EVAL-WHEN (:COMPILE-TOPLEVEL :EXECUTE) ..) aren't defined # in the fresh image). @@ -34,117 +48,10 @@ echo //entering make-host-2.sh # 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 - (setf *print-level* 5 *print-length* 5) - (load "src/cold/shared.lisp") - (in-package "SB-COLD") - (setf *host-obj-prefix* "obj/from-host/" - *target-obj-prefix* "obj/from-xc/") - (load "src/cold/set-up-cold-packages.lisp") - (load "src/cold/defun-load-or-cload-xcompiler.lisp") - (load-or-cload-xcompiler #'host-load-stem) - (defun proclaim-target-optimization () - (let ((debug (if (find :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))))) - (compile 'proclaim-target-optimization) - (defun in-target-cross-compilation-mode (fn) - "Call FN with everything set up appropriately for cross-compiling - a target file." - (let (;; Life is simpler at genesis/cold-load time if we - ;; needn't worry about byte-compiled code. - (sb!ext:*byte-compile-top-level* nil) - ;; In order to reduce peak memory usage during GENESIS, - ;; it helps to stuff several toplevel forms together - ;; into the same function. - (sb!c::*top-level-lambda-max* 10) - ;; Let the target know that we're the cross-compiler. - (*features* (cons :sb-xc *features*)) - ;; We need to tweak the readtable.. - (*readtable* (copy-readtable))) - ;; ..in order to make backquotes expand into target code - ;; instead of host code. - ;; FIXME: Isn't this now taken care of automatically by - ;; toplevel forms in the xcompiler backq.lisp file? - (set-macro-character #\` #'sb!impl::backquote-macro) - (set-macro-character #\, #'sb!impl::comma-macro) - ;; Control optimization policy. - (proclaim-target-optimization) - ;; Specify where target machinery lives. - (with-additional-nickname ("SB-XC" "SB!XC") - (funcall fn)))) - (compile 'in-target-cross-compilation-mode) - (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) - (load "src/cold/compile-cold-sbcl.lisp") - (let ((filename "output/object-filenames-for-genesis.lisp-expr")) - (ensure-directories-exist filename :verbose t) - (with-open-file (s filename :direction :output) - (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 - ;; to debug cold init if it wasn't.) - (when (find :sb-test *shebang-features*) - (load "tests/type.after-xc.lisp")) - ;; If you're experimenting with the system under a - ;; cross-compilation host which supports CMU-CL-style SAVE-LISP, - ;; this can be a good time to run it. The resulting core isn't - ;; used in the normal build, but can be handy for experimenting - ;; with the system. - (when (find :sb-show *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")) - EOF - -# Run GENESIS again in order to create cold-sbcl.core. -# -# In a fresh host Lisp invocation, load the cross-compiler (in order -# to get various definitions that GENESIS needs, not in order to -# cross-compile GENESIS, then load and run GENESIS. (We use a fresh -# host Lisp invocation here for basically the same reasons we did -# before when loading and running the cross-compiler.) -# -# (Why do we need this second invocation of GENESIS? In order to -# create a .core file, as opposed to just a .h file, GENESIS needs -# symbol table data on the C runtime. And we can get that symbol -# data only after the C runtime has been built. Therefore, even -# though we ran GENESIS earlier, we couldn't get it to make a .core -# file at that time; but we needed to run it earlier in order to -# get to where we can write a .core file.) -echo //loading and running GENESIS to create cold-sbcl.core -$SBCL_XC_HOST <<-'EOF' || exit 1 - (setf *print-level* 5 *print-length* 5) - (load "src/cold/shared.lisp") - (in-package "SB-COLD") - (setf *host-obj-prefix* "obj/from-host/" - *target-obj-prefix* "obj/from-xc/") - (load "src/cold/set-up-cold-packages.lisp") - (load "src/cold/defun-load-or-cload-xcompiler.lisp") - (load-or-cload-xcompiler #'host-load-stem) - (defparameter *target-object-file-names* - (with-open-file (s "output/object-filenames-for-genesis.lisp-expr" - :direction :input) - (read s))) - (host-load-stem "compiler/generic/genesis") - (sb!vm:genesis :object-file-names *target-object-file-names* - :c-header-file-name "output/sbcl2.h" - :symbol-table-file-name "src/runtime/sbcl.nm" - :core-file-name "output/cold-sbcl.core" - ;; The map file is not needed by the system, but can - ;; be very handy when debugging cold init problems. - :map-file-name "output/cold-sbcl.map") - EOF +$SBCL_XC_HOST < make-host-2.lisp -echo //testing for consistency of first and second GENESIS passes -if cmp src/runtime/sbcl.h output/sbcl2.h; then - echo //sbcl2.h matches sbcl.h -- good. -else - echo error: sbcl2.h does not match sbcl.h. - exit 1 -fi +# Run GENESIS (again) in order to create cold-sbcl.core. (The first +# time was before we ran the cross-compiler, in order to create the +# header file which was needed in order to run gcc on the runtime +# code.) +sh make-genesis-2.sh