X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=277f0c6849624e84c660bf640de3e6311dbb2467;hb=f3783ae14bde14c5aefd3d9383d89379defcb00f;hp=72d3a40700af7c6e9851e91b10ed0262bcdd8866;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp
index 72d3a40..277f0c6 100644
--- a/src/compiler/generic/genesis.lisp
+++ b/src/compiler/generic/genesis.lisp
@@ -1439,7 +1439,7 @@
 		    ;; ..and the fifth seems to match most
 		    ;; actual symbols, at least in RedHat 6.2.
 		    "")
-	 #!+freebsd #("")
+	 #!+freebsd #("" "ldso_stub__")
 	 #!+openbsd #("_")))
     (or (some (lambda (prefix)
 		(gethash (concatenate 'string prefix name)
@@ -2639,7 +2639,7 @@
 	      ;; We actually ran GENESIS, use the real value.
 	      (descriptor-bits (cold-intern symbol))
 	      ;; We didn't run GENESIS, so guess at the address.
-	      (+ sb!vm:*target-static-space-start*
+	      (+ sb!vm:*static-space-start*
 		 sb!vm:word-bytes
 		 sb!vm:other-pointer-type
 		 (if symbol (sb!vm:static-symbol-offset symbol) 0)))))
@@ -2807,7 +2807,7 @@ initially undefined function references:~2%")
 	(*data-page* 0))
 
     (format t
-	    "[building initial core file in file ~S: ~%"
+	    "[building initial core file in ~S: ~%"
 	    filenamestring)
     (force-output)
 
@@ -2940,13 +2940,13 @@ initially undefined function references:~2%")
 	   (*cold-package-symbols* nil)
 	   (*read-only* (make-gspace :read-only
 				     read-only-space-id
-				     sb!vm:*target-read-only-space-start*))
+				     sb!vm:*read-only-space-start*))
 	   (*static*    (make-gspace :static
 				     static-space-id
-				     sb!vm:*target-static-space-start*))
+				     sb!vm:*static-space-start*))
 	   (*dynamic*   (make-gspace :dynamic
 				     dynamic-space-id
-				     sb!vm:*target-dynamic-space-start*))
+				     sb!vm:*dynamic-space-start*))
 	   (*nil-descriptor* (make-nil-descriptor))
 	   (*current-reversed-cold-toplevels* *nil-descriptor*)
 	   (*unbound-marker* (make-other-immediate-descriptor
@@ -3028,11 +3028,11 @@ initially undefined function references:~2%")
       (finalize-load-time-value-noise)
 
       ;; Tell the target Lisp how much stuff we've allocated.
-      (cold-set '*read-only-space-free-pointer*
+      (cold-set 'sb!vm:*read-only-space-free-pointer*
 		(allocate-descriptor *read-only* 0 sb!vm:even-fixnum-type))
-      (cold-set '*static-space-free-pointer*
+      (cold-set 'sb!vm:*static-space-free-pointer*
 		(allocate-descriptor *static* 0 sb!vm:even-fixnum-type))
-      (cold-set '*initial-dynamic-space-free-pointer*
+      (cold-set 'sb!vm:*initial-dynamic-space-free-pointer*
 		(allocate-descriptor *dynamic* 0 sb!vm:even-fixnum-type))
       (/show "done setting free pointers")