X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=build-order.lisp-expr;h=55a52cfc8a0ac2170a5549ea8cebc1d20be9d1fd;hb=17794352c2ef078a1fc3cdd306f17f7328edf40b;hp=26cbf1cd202500cd3445e112473dfcef4f9504f5;hpb=6daed982c84c6679df360561d48e8817bf6ed583;p=sbcl.git

diff --git a/build-order.lisp-expr b/build-order.lisp-expr
index 26cbf1c..55a52cf 100644
--- a/build-order.lisp-expr
+++ b/build-order.lisp-expr
@@ -66,11 +66,14 @@
  ;; that they can handle the change. -- WHN 19990919
  ("src/code/defsetfs")
 
+ ("src/code/cold-init-helper-macros")
+
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;; cross-compiler-only replacements for stuff which in target Lisp would be
  ;;; supplied by basic machinery
 
  ("src/code/cross-misc"  :not-target)
+ ("src/code/cross-char"  :not-target)
  ("src/code/cross-byte"  :not-target)
  ("src/code/cross-float" :not-target)
  ("src/code/cross-io"    :not-target)
@@ -89,6 +92,9 @@
 
  ("src/code/primordial-extensions")
 
+ ;; comes early so that stuff can reason about function names
+ ("src/code/function-names")
+
  ;; for various constants e.g. SB!XC:MOST-POSITIVE-FIXNUM and
  ;; SB!VM:N-LOWTAG-BITS, needed by "early-objdef" and others
  ("src/compiler/generic/early-vm")
@@ -96,9 +102,9 @@
  ("src/compiler/target/parms")
  ("src/code/early-array") ; needs "early-vm" numbers
 
+ ("src/code/early-extensions") ; on host for COLLECT, SYMBOLICATE, etc.
  ("src/code/parse-body")       ; on host for PARSE-BODY
  ("src/code/parse-defmacro")   ; on host for PARSE-DEFMACRO
- ("src/code/early-extensions") ; on host for COLLECT, SYMBOLICATE, etc.
  ("src/compiler/deftype")      ; on host for SB!XC:DEFTYPE
  ("src/compiler/defconstant")
  ("src/code/early-alieneval")  ; for vars needed both at build and run time
@@ -111,8 +117,6 @@
  ;; mostly needed by stuff from comcom, but also used by "x86-vm"
  ("src/code/debug-var-io")
 
- ("src/code/cold-init-helper-macros")
-
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;; basic machinery for the target Lisp. Note that although most of these
  ;;; files are flagged :NOT-HOST, a few might not be.
@@ -129,6 +133,8 @@
 
  ("src/code/defbangstruct")
 
+ ("src/code/unportable-float")
+ 
  ("src/code/funutils" :not-host)
 
  ;; This needs DEF!STRUCT, and is itself needed early so that structure
@@ -238,8 +244,6 @@
  ("src/code/misc")
 
  ("src/code/room"   :not-host)
- ("src/code/gc"     :not-host)
- ("src/code/purify" :not-host)
 
  ("src/code/stream"        :not-host)
  ("src/code/print"         :not-host)
@@ -331,6 +335,7 @@
  ;; in class.lisp.
  ("src/code/condition" :not-host)
 
+ ("src/compiler/generic/vm-array")
  ("src/compiler/generic/primtype")
 
  ;; the implementation of the compiler-affecting part of forms like
@@ -338,12 +343,16 @@
  ;; defining types
  ("src/compiler/parse-lambda-list")
 
+ ;; The following two files trigger function/macro redefinition
+ ;; warnings in clisp during make-host-2; as a workaround, we ignore
+ ;; the failure values from COMPILE-FILE under clisp.
+ 
  ;; for DEFSTRUCT ALIEN-TYPE, needed by host-type.lisp
- ("src/code/host-alieneval")
+ ("src/code/host-alieneval" #+clisp :ignore-failure-p)
 
  ;; can't be done until definition of e.g. DEFINE-ALIEN-TYPE-CLASS in
  ;; host-alieneval.lisp
- ("src/code/host-c-call")
+ ("src/code/host-c-call" #+clisp :ignore-failure-p)
 
  ;; SB!XC:DEFTYPE is needed in order to compile late-type
  ;; in the host Common Lisp, and in order to run, it needs
@@ -368,6 +377,8 @@
  ("src/code/cross-type" :not-target)
  ("src/compiler/generic/vm-type")
  ("src/compiler/proclaim")
+
+ ("src/code/class-init")
  ("src/code/typecheckfuns")
 
  ;; The DEFSTRUCT machinery needs SB!XC:SUBTYPEP, defined in 
@@ -391,6 +402,9 @@
  ("src/compiler/compiler-error")
 
  ("src/code/type-init")
+ ;; Now that the type system is initialized, fix up UNKNOWN types that
+ ;; have crept in.
+ ("src/compiler/fixup-type")
 
  ;; These define target types needed by fndb.lisp.
  ("src/code/package")
@@ -427,7 +441,8 @@
  ;; (and so that they don't cause lots of annoying compiler warnings
  ;; about undefined types). 
  ("src/compiler/generic/core")
-
+ ("src/code/cross-thread" :not-target)
+ ("src/code/thread")
  ("src/code/load")
 
  ("src/code/fop") ; needs macros from code/load.lisp
@@ -445,6 +460,7 @@
  ("src/compiler/main") ; needs DEFSTRUCT FASL-OUTPUT from dump.lisp
  ("src/compiler/target-main" :not-host)
  ("src/compiler/ir1tran")
+ ("src/compiler/ir1tran-lambda")
  ("src/compiler/ir1-translators")
  ("src/compiler/ir1util")
  ("src/compiler/ir1report")
@@ -511,6 +527,7 @@
  ("src/compiler/target/alloc")
  ("src/compiler/target/call")
  ("src/compiler/target/nlx")
+ ("src/compiler/generic/late-nlx")
  ("src/compiler/target/show")
  ("src/compiler/target/array"
   ;; KLUDGE: Compiling this file for X86 raises alarming warnings of
@@ -527,6 +544,7 @@
   ;; what the problem is and fix it. (See the comments in
   ;; src/compiler/x86/array for a candidate patch.) -- WHN 19990323
   :ignore-failure-p)
+ ("src/compiler/generic/array")
  ("src/compiler/target/pred")
 
  ("src/compiler/target/type-vops")
@@ -600,7 +618,13 @@
                                           ;   from "code/pathname"
  ("src/code/sharpm"            :not-host) ; uses stuff from "code/reader"
 
+ #!+sb-thread
+ ("src/code/target-thread"     :not-host)
+ #!-sb-thread
+ ("src/code/target-unithread"  :not-host)
  ;; defines SB!DI:DO-DEBUG-FUN-BLOCKS, needed by target-disassem.lisp
+ ("src/code/gc"     :not-host)
+ ("src/code/purify" :not-host)
  ("src/code/debug-int" :not-host)
 
  ;; target-only assemblerish stuff
@@ -633,6 +657,10 @@
  ;; DEFVAR or DEFPARAMETER.
  ("src/code/cl-specials")
 
+ ;; FIXME: here? earlier?  can probably be as late as possible.  Also
+ ;; maybe call it FORCE-DELAYED-PROCLAIMS?
+ ("src/compiler/late-proclaim")
+ 
  ;; fundamental target macros (e.g. CL:DO and CL:DEFUN) and support
  ;; for them
  ("src/code/defboot")