0.8.10.9:

[sbcl.git] / src / cold / defun-load-or-cload-xcompiler.lisp

diff --git a/src/cold/defun-load-or-cload-xcompiler.lisp b/src/cold/defun-load-or-cload-xcompiler.lisp
index d195581..d489b03 100644 (file)
--- a/src/cold/defun-load-or-cload-xcompiler.lisp
+++ b/src/cold/defun-load-or-cload-xcompiler.lisp
@@ -13,6 +13,8 @@
 ;;; cross-compilation host Common Lisp.
 (defun load-or-cload-xcompiler (load-or-cload-stem)
 
+  (declare (type function load-or-cload-stem))
+
   ;; The running-in-the-host-Lisp Python cross-compiler defines its
   ;; own versions of a number of functions which should not overwrite
   ;; host-Lisp functions. Instead we put them in a special package.
@@ -88,8 +90,16 @@
 
                    ;; everything else which needs a separate
                     ;; existence in xc and target
+                   "BOOLE"
+                   "BOOLE-CLR" "BOOLE-SET" "BOOLE-1" "BOOLE-2"
+                   "BOOLE-C1" "BOOLE-C2" "BOOLE-AND" "BOOLE-IOR"
+                   "BOOLE-XOR" "BOOLE-EQV" "BOOLE-NAND" "BOOLE-NOR"
+                   "BOOLE-ANDC1" "BOOLE-ANDC2" "BOOLE-ORC1" "BOOLE-ORC2"
                    "BUILT-IN-CLASS"
+                   "BYTE" "BYTE-POSITION" "BYTE-SIZE"
+                   "CHAR-CODE"
                    "CLASS" "CLASS-NAME" "CLASS-OF"
+                   "CODE-CHAR"
                    "COMPILE-FILE"
                    "COMPILE-FILE-PATHNAME"
                    "*COMPILE-FILE-PATHNAME*"
@@ -102,14 +112,17 @@
                    "DEFINE-MODIFY-MACRO"
                    "DEFINE-SETF-EXPANDER"
                    "DEFMACRO" "DEFSETF" "DEFSTRUCT" "DEFTYPE"
+                   "DEPOSIT-FIELD" "DPB"
                    "FBOUNDP" "FDEFINITION" "FMAKUNBOUND"
                    "FIND-CLASS"
                    "GET-SETF-EXPANSION"
-                   "LAMBDA-LIST-KEYWORDS"
+                   "LDB" "LDB-TEST"
                    "LISP-IMPLEMENTATION-TYPE" "LISP-IMPLEMENTATION-VERSION"
                    "MACRO-FUNCTION"
                    "MACROEXPAND" "MACROEXPAND-1" "*MACROEXPAND-HOOK*"
                    "MAKE-LOAD-FORM"
+                   "MAKE-LOAD-FORM-SAVING-SLOTS"
+                   "MASK-FIELD"
                    "PACKAGE" "PACKAGEP"
                    "PROCLAIM"
                    "SPECIAL-OPERATOR-P"
@@ -117,8 +130,25 @@
                    "STRUCTURE-CLASS"
                    "SUBTYPEP"
                    "TYPE-OF" "TYPEP"
+                   "UPGRADED-ARRAY-ELEMENT-TYPE"
+                   "UPGRADED-COMPLEX-PART-TYPE"
                    "WITH-COMPILATION-UNIT"))
       (export (intern name package-name) package-name)))
+  ;; don't watch:
+  (dolist (package (list-all-packages))
+    (when (= (mismatch (package-name package) "SB!") 3)
+      (shadowing-import
+       (mapcar (lambda (name) (find-symbol name "SB-XC"))
+              '("BYTE" "BYTE-POSITION" "BYTE-SIZE"
+                "DPB" "LDB" "LDB-TEST"
+                "DEPOSIT-FIELD" "MASK-FIELD"
+                
+                "BOOLE"
+                "BOOLE-CLR" "BOOLE-SET" "BOOLE-1" "BOOLE-2"
+                "BOOLE-C1" "BOOLE-C2" "BOOLE-AND" "BOOLE-IOR"
+                "BOOLE-XOR" "BOOLE-EQV" "BOOLE-NAND" "BOOLE-NOR"
+                "BOOLE-ANDC1" "BOOLE-ANDC2" "BOOLE-ORC1" "BOOLE-ORC2"))
+       package)))
 
   ;; Build a version of Python to run in the host Common Lisp, to be
   ;; used only in cross-compilation.