From 72d4bf00fa8035ffbc9f9e6036fccea78162328a Mon Sep 17 00:00:00 2001 From: pmai <pmai> Date: Fri, 4 Oct 2002 15:11:13 +0000 Subject: [PATCH] The removal of the OLD-XX package nicknames for the VM packages causes problems for certain kinds of cross-compiles, which need the nickname at worldload time to gather up OLD-XX references into the non-OLD package. Hence we temporarily add the OLD-XX nicknames back during world-load. --- tools/worldload.lisp | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/tools/worldload.lisp b/tools/worldload.lisp index d04a82cc2..aac8a354d 100644 --- a/tools/worldload.lisp +++ b/tools/worldload.lisp @@ -6,7 +6,7 @@ ;;; If you want to use this code or any part of CMU Common Lisp, please contact ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; -;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.96 2002/05/16 19:52:58 pmai Exp $ +;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldload.lisp,v 1.97 2002/10/04 15:11:13 pmai Exp $ ;;; ;;; ********************************************************************** ;;; @@ -83,6 +83,24 @@ ;;; (maybe-byte-load "code:exports") +;;; Temporarily add OLD-XX nicknames needed for certain cross-compiles +#+pmax +(rename-package "PMAX" "PMAX" '("VM" "OLD-PMAX")) +#+sparc +(rename-package "SPARC" "SPARC" '("VM" "OLD-SPARC")) +#+ibmrt +(rename-package "RT" "RT" '("VM" "OLD-RT")) +#+x86 +(rename-package "X86" "X86" '("VM" "OLD-X86")) +#+hppa +(rename-package "HPPA" "HPPA" '("VM" "OLD-HPPA")) +#+alpha +(rename-package "ALPHA" "ALPHA" '("VM" "OLD-ALPHA")) +#+sgi +(rename-package "SGI" "SGI" '("VM" "OLD-SGI")) +#+ppc +(rename-package "PPC" "PPC" '("VM" "OLD-PPC")) + ;;; Load random code sources. (maybe-byte-load "code:format-time") @@ -184,6 +202,24 @@ (setf (search-list "modules:") '("./")) (setf (search-list "target:") *target-sl*) +;;; Remove temporarily added OLD-XX nicknames +#+pmax +(rename-package "PMAX" "PMAX" '("VM")) +#+sparc +(rename-package "SPARC" "SPARC" '("VM")) +#+ibmrt +(rename-package "RT" "RT" '("VM")) +#+x86 +(rename-package "X86" "X86" '("VM")) +#+hppa +(rename-package "HPPA" "HPPA" '("VM")) +#+alpha +(rename-package "ALPHA" "ALPHA" '("VM")) +#+sgi +(rename-package "SGI" "SGI" '("VM")) +#+ppc +(rename-package "PPC" "PPC" '("VM")) + ;;; Okay, build the thing! ;;; (progn -- GitLab