X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=build-order.lisp-expr;h=bacec9f03d1e79e5ff454950e2baa75fc606217f;hb=6d36f2d6954cb79e3c88fef33fe0c3ad63deaea8;hp=a164c6f9dfaf45e354c2653fcb6187eebc7c1c98;hpb=5cf3c4259d529e180d75d4d140f344e600d2b06b;p=sbcl.git

diff --git a/build-order.lisp-expr b/build-order.lisp-expr
index a164c6f..bacec9f 100644
--- a/build-order.lisp-expr
+++ b/build-order.lisp-expr
@@ -160,9 +160,6 @@
  ;; accessors.)
  ("src/code/type-class")
 
- ("src/code/early-pcounter")
- ("src/code/pcounter" :not-host)
-
  ("src/code/ansi-stream" :not-host)
 
  ("src/code/sysmacs" :not-host)
@@ -370,16 +367,12 @@
  ;; 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" #+clisp :ignore-failure-p)
+ ("src/code/host-alieneval")
 
  ;; can't be done until definition of e.g. DEFINE-ALIEN-TYPE-CLASS in
  ;; host-alieneval.lisp
- ("src/code/host-c-call" #+clisp :ignore-failure-p)
+ ("src/code/host-c-call")
 
  ;; SB!XC:DEFTYPE is needed in order to compile late-type
  ;; in the host Common Lisp, and in order to run, it needs
@@ -474,6 +467,9 @@
  ;; This has ASSEMBLY-UNIT-related stuff needed by core.lisp.
  ("src/compiler/early-assem")
 
+ ;; This has the BARRIER stuff that the threading support needs.
+ ("src/code/barrier")
+
  ;; core.lisp contains DEFSTRUCT CORE-OBJECT, and "compiler/main.lisp"
  ;; does lots of (TYPEP FOO 'CORE-OBJECT), so it's nice to compile this
  ;; before "compiler/main.lisp" so that those can be coded efficiently
@@ -497,6 +493,7 @@
 
  ("src/compiler/trace-table") ; needs EMIT-LABEL macro from compiler/assem.lisp
 
+ ("src/code/debug-info")
  ;; Compiling this requires fop definitions from code/fop.lisp and
  ;; trace table definitions from compiler/trace-table.lisp.
  ("src/compiler/dump")
@@ -531,8 +528,6 @@
  ("src/compiler/tn")
  ("src/compiler/life")
 
- ("src/code/debug-info")
-
  ("src/compiler/debug-dump")
  ("src/compiler/generic/utils")
  ("src/compiler/fopcompile")
@@ -602,14 +597,14 @@
  ("src/compiler/generic/late-type-vops")
 
  ;; KLUDGE: The assembly files need to be compiled twice: once as
- ;; normal lisp files, and once by sb-c:assemble-file.  We play some
- ;; symlink games to make sure we don't scribble over anything we
- ;; shouldn't, but these are actually the same files:
-
- ("src/compiler/assembly/target/assem-rtns")
- ("src/compiler/assembly/target/array")
- ("src/compiler/assembly/target/arith")
- ("src/compiler/assembly/target/alloc")
+ ;; normal lisp files, and once by sb-c:assemble-file.  We use a
+ ;; different suffix / "file type" for the :assem versions to make
+ ;; sure we don't scribble over anything we shouldn't.
+
+ ("src/assembly/target/assem-rtns")
+ ("src/assembly/target/array")
+ ("src/assembly/target/arith")
+ ("src/assembly/target/alloc")
  ("src/assembly/target/assem-rtns" :assem :not-host)
  ("src/assembly/target/array"      :assem :not-host)
  ("src/assembly/target/arith"      :assem :not-host)
@@ -690,6 +685,8 @@
  ("src/code/debug" :not-host)
 
  ("src/code/octets" :not-host)
+ ("src/code/external-formats/enc-basic" :not-host)
+ ("src/code/external-formats/enc-ebcdic" :not-host)
  #!+sb-unicode
  ("src/code/external-formats/enc-cyr" :not-host)
  #!+sb-unicode
@@ -709,7 +706,9 @@
  #!+sb-unicode
  ("src/code/external-formats/enc-jpn" :not-host)
  #!+sb-unicode
- ("src/code/external-formats/ucs-2" :not-host)
+ ("src/code/external-formats/enc-ucs" :not-host)
+ #!+sb-unicode
+ ("src/code/external-formats/enc-utf" :not-host)
 
  ;; The code here can't be compiled until CONDITION and
  ;; DEFINE-CONDITION are defined and SB!DEBUG:*STACK-TOP-HINT* is