X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fgenesis.lisp;h=ed462886a2646d1f16d56e9fe0e3ab74a7891cea;hb=902e93736a0888aa6b04dc328b1eb328423bf426;hp=f32e88dd9304e10533d1220e858b32ad8d2be1d0;hpb=3bb2fb5b9ecdeebecaded4ac6e5af0f653be8867;p=sbcl.git

diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp
index f32e88d..ed46288 100644
--- a/src/compiler/generic/genesis.lisp
+++ b/src/compiler/generic/genesis.lisp
@@ -598,7 +598,7 @@
 	 (des (allocate-vector-object gspace
 				      sb!vm:n-byte-bits
 				      (1+ length)
-				      sb!vm:simple-string-widetag))
+				      sb!vm:simple-base-string-widetag))
 	 (bytes (gspace-bytes gspace))
 	 (offset (+ (* sb!vm:vector-data-offset sb!vm:n-word-bytes)
 		    (descriptor-byte-offset des))))
@@ -1253,7 +1253,7 @@
   (macrolet ((frob (symbol)
 	       `(cold-set ',symbol
 			  (cold-fdefinition-object (cold-intern ',symbol)))))
-    (frob maybe-gc)
+    (frob sub-gc)
     (frob internal-error)
     (frob sb!kernel::control-stack-exhausted-error)
     (frob sb!di::handle-breakpoint)
@@ -2021,7 +2021,7 @@
 (defun cold-load-symbol (size package)
   (let ((string (make-string size)))
     (read-string-as-bytes *fasl-input-stream* string)
-    (cold-intern (intern string package) package)))
+    (cold-intern (intern string package))))
 
 (macrolet ((frob (name pname-len package-len)
 	     `(define-cold-fop (,name)
@@ -3290,7 +3290,12 @@ initially undefined function references:~2%")
 	  (dolist (obj structs)
 	    (out-to
 	     (string-downcase (string (sb!vm:primitive-object-name obj)))
-	     (write-primitive-object obj))))
+	     (write-primitive-object obj)))
+	  (out-to "primitive-objects"
+		  (dolist (obj structs)
+		    (format t "~&#include \"~A.h\"~%"
+			    (string-downcase 
+			     (string (sb!vm:primitive-object-name obj)))))))
 	(out-to "static-symbols" (write-static-symbols))
 	
       (when core-file-name