X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Flate-type.lisp;h=63cc7c6b6e94d819bf3a4b02e275de4d76591c82;hb=4e3b57699314dbd3883470d9b196287b178f3e6d;hp=3f0a53d0151329ba2a004accab2aac98527dbde0;hpb=e8f173ff44bc069db48585c8844f2d1097bb47d2;p=sbcl.git

diff --git a/src/code/late-type.lisp b/src/code/late-type.lisp
index 3f0a53d..63cc7c6 100644
--- a/src/code/late-type.lisp
+++ b/src/code/late-type.lisp
@@ -756,7 +756,17 @@
     (let ((res (specifier-type spec)))
       (unless (unknown-type-p res)
 	(setf (info :type :builtin spec) res)
-	(setf (info :type :kind spec) :primitive))))
+	;; KLUDGE: the three copies of this idiom in this file (and
+	;; the one in class.lisp as at sbcl-0.7.4.1x) should be
+	;; coalesced, or perhaps the error-detecting code that
+	;; disallows redefinition of :PRIMITIVE types should be
+	;; rewritten to use *TYPE-SYSTEM-FINALIZED* (rather than
+	;; *TYPE-SYSTEM-INITIALIZED*). The effect of this is not to
+	;; cause redefinition errors when precompute-types is called
+	;; for a second time while building the target compiler using
+	;; the cross-compiler. -- CSR, trying to explain why this
+	;; isn't completely wrong, 2002-06-07
+	(setf (info :type :kind spec) #+sb-xc-host :defined #-sb-xc-host :primitive))))
   (values))
 
 ;;;; general TYPE-UNION and TYPE-INTERSECTION operations
@@ -908,7 +918,7 @@
  (macrolet ((frob (name var)
 	      `(progn
 		 (setq ,var (make-named-type :name ',name))
-		 (setf (info :type :kind ',name) :primitive)
+		 (setf (info :type :kind ',name) #+sb-xc-host :defined #-sb-xc-host :primitive)
 		 (setf (info :type :builtin ',name) ,var))))
    ;; KLUDGE: In ANSI, * isn't really the name of a type, it's just a
    ;; special symbol which can be stuck in some places where an
@@ -1412,7 +1422,7 @@
 				       >= > t)))))))
 
 (!cold-init-forms
-  (setf (info :type :kind 'number) :primitive)
+  (setf (info :type :kind 'number) #+sb-xc-host :defined #-sb-xc-host :primitive)
   (setf (info :type :builtin 'number)
 	(make-numeric-type :complexp nil)))