Skip to content
Snippets Groups Projects
Commit eef3a4b4 authored by toy's avatar toy
Browse files

From Eric Marsden:

  * distributed binaries should no longer have OLD-xx package
    nicknames (for the VM and the compiler packages). These nicknames
    are set up by the build and cross-compile scripts, as needed.
parent 7137fbba
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.192 2002/08/23 17:10:29 pmai Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/exports.lisp,v 1.193 2002/08/26 20:45:03 toy Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -42,36 +42,36 @@ ...@@ -42,36 +42,36 @@
(make-package "EVAL" :nicknames 'nil :use nil)) (make-package "EVAL" :nicknames 'nil :use nil))
#+pmax #+pmax
(if (find-package "PMAX") (if (find-package "PMAX")
(rename-package "PMAX" "PMAX" '("VM" "OLD-PMAX")) (rename-package "PMAX" "PMAX" '("VM"))
(make-package "PMAX" :nicknames '("VM" "OLD-PMAX") :use nil)) (make-package "PMAX" :nicknames '("VM") :use nil))
#+sparc #+sparc
(if (find-package "SPARC") (if (find-package "SPARC")
(rename-package "SPARC" "SPARC" '("VM" "OLD-SPARC")) (rename-package "SPARC" "SPARC" '("VM"))
(make-package "SPARC" :nicknames '("VM" "OLD-SPARC") :use nil)) (make-package "SPARC" :nicknames '("VM") :use nil))
#+ibmrt #+ibmrt
(if (find-package "RT") (if (find-package "RT")
(rename-package "RT" "RT" '("VM" "OLD-RT")) (rename-package "RT" "RT" '("VM"))
(make-package "RT" :nicknames '("VM" "OLD-RT") :use nil)) (make-package "RT" :nicknames '("VM") :use nil))
#+x86 #+x86
(if (find-package "X86") (if (find-package "X86")
(rename-package "X86" "X86" '("VM" "OLD-X86")) (rename-package "X86" "X86" '("VM"))
(make-package "X86" :nicknames '("VM" "OLD-X86") :use nil)) (make-package "X86" :nicknames '("VM") :use nil))
#+hppa #+hppa
(if (find-package "HPPA") (if (find-package "HPPA")
(rename-package "HPPA" "HPPA" '("VM" "OLD-HPPA")) (rename-package "HPPA" "HPPA" '("VM"))
(make-package "HPPA" :nicknames '("VM" "OLD-HPPA") :use nil)) (make-package "HPPA" :nicknames '("VM") :use nil))
#+alpha #+alpha
(if (find-package "ALPHA") (if (find-package "ALPHA")
(rename-package "ALPHA" "ALPHA" '("VM" "OLD-ALPHA")) (rename-package "ALPHA" "ALPHA" '("VM"))
(make-package "ALPHA" :nicknames '("VM" "OLD-ALPHA") :use nil)) (make-package "ALPHA" :nicknames '("VM") :use nil))
#+sgi #+sgi
(if (find-package "SGI") (if (find-package "SGI")
(rename-package "SGI" "SGI" '("VM" "OLD-SGI")) (rename-package "SGI" "SGI" '("VM"))
(make-package "SGI" :nicknames '("VM" "OLD-SGI") :use nil)) (make-package "SGI" :nicknames '("VM") :use nil))
#+ppc #+ppc
(if (find-package "PPC") (if (find-package "PPC")
(rename-package "PPC" "PPC" '("VM" "OLD-PPC")) (rename-package "PPC" "PPC" '("VM"))
(make-package "PPC" :nicknames '("VM" "OLD-PPC"))) (make-package "PPC" :nicknames '("VM")))
(if (find-package "CONDITIONS") (if (find-package "CONDITIONS")
(rename-package "CONDITIONS" "CONDITIONS" 'nil) (rename-package "CONDITIONS" "CONDITIONS" 'nil)
(make-package "CONDITIONS" :nicknames 'nil :use nil)) (make-package "CONDITIONS" :nicknames 'nil :use nil))
...@@ -617,12 +617,15 @@ ...@@ -617,12 +617,15 @@
'("%SP-SET-DEFINITION" "%SP-SET-PLIST" "ARRAY-HEADER-P" "BASE-CHAR-P" '("%SP-SET-DEFINITION" "%SP-SET-PLIST" "ARRAY-HEADER-P" "BASE-CHAR-P"
"DOUBLE-FLOAT-P" "LONG-FLOAT-P" "SIMPLE-ARRAY-P" "SINGLE-FLOAT-P")) "DOUBLE-FLOAT-P" "LONG-FLOAT-P" "SIMPLE-ARRAY-P" "SINGLE-FLOAT-P"))
(intern name "KERNEL")) (intern name "KERNEL"))
(defpackage #+pmax "PMAX" #+sparc "SPARC" #+ibmrt "RT" (defpackage #+pmax "PMAX"
#+x86 "X86" #+hppa "HPPA" #+alpha "ALPHA" #+sgi "SGI" #+ppc "PPC" #+sparc "SPARC"
(:nicknames "VM" #+(or pmax sgi) "MIPS" #+ibmrt "RT"
#+pmax "OLD-MIPS" #+ibmrt "OLD-RT" #+x86 "X86"
#+x86 "OLD-X86" #+hppa "HPPA" #+alpha "OLD-ALPHA" #+hppa "HPPA"
#+sgi "OLD-SGI" #+ppc "OLD-PPC") #+alpha "ALPHA"
#+sgi "SGI"
#+ppc "PPC"
(:nicknames "VM" #+(or pmax sgi) "MIPS")
(:import-from "LISP" "%ARRAY-TYPEP" "%ASET" "%BITSET" "%CHARSET" (:import-from "LISP" "%ARRAY-TYPEP" "%ASET" "%BITSET" "%CHARSET"
"%PUT" "%RPLACA" "%RPLACD" "%SBITSET" "%SCHARSET" "%PUT" "%RPLACA" "%RPLACD" "%SBITSET" "%SCHARSET"
"%SET-FDEFINITION" "%SET-FILL-POINTER" "%SET-FDEFINITION" "%SET-FILL-POINTER"
...@@ -1098,7 +1101,7 @@ ...@@ -1098,7 +1101,7 @@
(intern name "LISP")) (intern name "LISP"))
(defpackage "C" (defpackage "C"
(:nicknames "OLD-C") (:nicknames "COMPILER")
(:import-from "LISP" "%ARRAY-TYPEP" "%ASET" (:import-from "LISP" "%ARRAY-TYPEP" "%ASET"
"%BITSET" "%CHARSET" "%PUT" "%RPLACA" "%RPLACD" "%SBITSET" "%BITSET" "%CHARSET" "%PUT" "%RPLACA" "%RPLACD" "%SBITSET"
"%SCHARSET" "%SET-FDEFINITION" "%SCHARSET" "%SET-FDEFINITION"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
(ext:file-comment (ext:file-comment
"$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/comcom.lisp,v 1.51 1999/01/09 11:05:20 dtc Exp $") "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/comcom.lisp,v 1.52 2002/08/26 20:45:03 toy Exp $")
;;; ;;;
;;; ********************************************************************** ;;; **********************************************************************
;;; ;;;
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
(defvar *byte-compile* #+small t #-small :maybe) (defvar *byte-compile* #+small t #-small :maybe)
(unless (find-package "OLD-C")
(rename-package "C" "C" '("OLD-C")))
;;; Import so that these types which appear in the globldb are the same... ;;; Import so that these types which appear in the globldb are the same...
#+bootstrap #+bootstrap
(import '(old-c::approximate-function-type (import '(old-c::approximate-function-type
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment