X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fdefun-load-or-cload-xcompiler.lisp;h=c61e18b7c7b3802dd3b89703129684cbb246a4d3;hb=f1407e424f1063203af07d2e61ceef58515a4797;hp=8fcc696af264e44420a2afa2cbfc1f85e22b635e;hpb=d202a453b45430e04671b966c01bc067c2667442;p=sbcl.git

diff --git a/src/cold/defun-load-or-cload-xcompiler.lisp b/src/cold/defun-load-or-cload-xcompiler.lisp
index 8fcc696..c61e18b 100644
--- 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.
@@ -89,6 +91,7 @@
 		    ;; everything else which needs a separate
                     ;; existence in xc and target
 		    "BUILT-IN-CLASS"
+		    "BYTE" "BYTE-POSITION" "BYTE-SIZE"
 		    "CLASS" "CLASS-NAME" "CLASS-OF"
 		    "COMPILE-FILE"
 		    "COMPILE-FILE-PATHNAME"
@@ -102,14 +105,17 @@
 		    "DEFINE-MODIFY-MACRO"
 		    "DEFINE-SETF-EXPANDER"
 		    "DEFMACRO" "DEFSETF" "DEFSTRUCT" "DEFTYPE"
+		    "DEPOSIT-FIELD" "DPB"
 		    "FBOUNDP" "FDEFINITION" "FMAKUNBOUND"
 		    "FIND-CLASS"
 		    "GET-SETF-EXPANSION"
+		    "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"
@@ -119,6 +125,37 @@
 		    "TYPE-OF" "TYPEP"
 		    "WITH-COMPILATION-UNIT"))
       (export (intern name package-name) package-name)))
+  ;; don't watch:
+  (dolist (package-name '("SB!ALIEN"
+			  "SB!ALIEN-INTERNALS"
+			  "SB!ASSEM"
+			  "SB!BIGNUM"
+			  "SB!C"
+			  "SB!DEBUG"
+			  "SB!DI"
+			  "SB!DISASSEM"
+			  #!+sb-dyncount "SB!DYNCOUNT"
+			  "SB!FASL"
+			  "SB!IMPL"
+			  "SB!EXT"
+			  "SB!FORMAT"
+			  "SB!GRAY"
+			  "SB!INT"
+			  "SB!KERNEL"
+			  "SB!LOOP"
+			  "SB!PCL"
+			  "SB!PRETTY"
+			  "SB!PROFILE"
+			  "SB!SYS"
+			  "SB!THREAD"
+			  "SB!UNIX"
+			  "SB!VM"
+			  "SB!WALKER"))
+    (shadowing-import (mapcar (lambda (name) (find-symbol name "SB-XC"))
+			      '("BYTE" "BYTE-POSITION" "BYTE-SIZE"
+				"DPB" "LDB" "LDB-TEST"
+				"DEPOSIT-FIELD" "MASK-FIELD"))
+		      package-name))
 
   ;; Build a version of Python to run in the host Common Lisp, to be
   ;; used only in cross-compilation.