X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=build-order.lisp-expr;h=f8372526ae4414235296b57fca185386a8313b1b;hb=99a8f9e012fd2b5edc9a0927edfc537332081997;hp=c44ad4382e7abd182d1f61af2fcd21fa883afbf0;hpb=fe19212267bef96fedb712ebb43abc91631aea18;p=sbcl.git

diff --git a/build-order.lisp-expr b/build-order.lisp-expr
index c44ad43..f837252 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)
@@ -497,6 +494,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 +529,6 @@
  ("src/compiler/tn")
  ("src/compiler/life")
 
- ("src/code/debug-info")
-
  ("src/compiler/debug-dump")
  ("src/compiler/generic/utils")
  ("src/compiler/fopcompile")
@@ -602,14 +598,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)
@@ -631,6 +627,7 @@
 
  ("src/compiler/copyprop")
  ("src/compiler/represent")
+ ("src/compiler/ir2opt")
  ("src/compiler/pack")
  ("src/compiler/codegen")
  ("src/compiler/debug")
@@ -689,6 +686,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
@@ -708,7 +707,7 @@
  #!+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)
 
  ;; The code here can't be compiled until CONDITION and
  ;; DEFINE-CONDITION are defined and SB!DEBUG:*STACK-TOP-HINT* is