CMUCL commit: src/tools/cross-scripts (cross-x86-x86.lisp)

[Raymond Toy]

    Date: Thursday, July 22, 2010 @ 22:06:53
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/tools/cross-scripts

Modified: cross-x86-x86.lisp

Fix long-standing compiler error when cross-compiling the new
compiler.  There are errors about undefined FIXUP-CODE-OBJECT and
SANCTIFY-FOR-EXECUTION functions when compiling generic/core.lisp.

This allows the cross-compiling compiler to use the -batch flag.


--------------------+
 cross-x86-x86.lisp |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)


Index: src/tools/cross-scripts/cross-x86-x86.lisp
diff -u src/tools/cross-scripts/cross-x86-x86.lisp:1.11 src/tools/cross-scripts/cross-x86-x86.lisp:1.12
--- src/tools/cross-scripts/cross-x86-x86.lisp:1.11	Thu Sep 17 12:16:42 2009
+++ src/tools/cross-scripts/cross-x86-x86.lisp	Thu Jul 22 22:06:53 2010
@@ -36,6 +36,16 @@
 ;;; Compile the new backend.
 (pushnew :bootstrap *features*)
 (pushnew :building-cross-compiler *features*)
+
+;; Make fixup-code-object and sanctify-for-execution in the VM package
+;; be the same as the original.  Needed to get rid of a compiler error
+;; in generic/core.lisp.  (This halts cross-compilations if the
+;; compiling lisp uses the -batch flag.
+(import 'old-vm::fixup-code-object "VM")
+(import 'old-vm::sanctify-for-execution "VM")
+(export 'vm::fixup-code-object "VM")
+(export 'vm::sanctify-for-execution "VM")
+
 (load "target:tools/comcom")
 
 ;;; Load the new backend.
@@ -193,8 +203,6 @@
   (declare (type simple-string name))
   name)
 (export 'extern-alien-name)
-(export 'fixup-code-object)
-(export 'sanctify-for-execution)
 (in-package :cl-user)
 
 ;;; Don't load compiler parts from the target compilation