common-lisp/sbcl.sbcl
1
0
Fork 0
mirror of git://git.code.sf.net/p/sbcl/sbcl synced 2026-09-10 07:26:40 -04:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Avoid using STEM-OBJECT-PATH in genesis per se

Browse source 
Causes problems unless artifacts are directly beneath source tree,
which they aren't for my customized build.
This commit is contained in:
Douglas Katzman 2020-01-24 15:22:28 -05:00
parent 2274eb4c8e
commit cae7ede71f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
make-genesis-2.lisp
View file

@ -14,6 +14,8 @@
(push (stem-object-path stem flags :target-compile)
list)))
(nreverse list))
:defstruct-descriptions (stem-object-path
"defstructs.lisp-expr" '(:extra-artifact) :target-compile)
:tls-init (read-from-file
(stem-object-path "tls-init.lisp-expr"
'(:extra-artifact) :target-compile))

9
src/compiler/generic/genesis.lisp
View file

@ -1124,9 +1124,8 @@ core and return a descriptor to it."
(sb-vm::sign-extend (read-bits-wordindexed cold-object index)
sb-vm:n-word-bits))))))
(defun read-structure-definitions ()
(with-open-file (stream (sb-cold:stem-object-path
"defstructs.lisp-expr" '(:extra-artifact) :target-compile))
(defun read-structure-definitions (pathname)
(with-open-file (stream pathname)
(loop
(let ((ch (peek-char t stream)))
(when (char= ch #\;)
@ -3530,6 +3529,7 @@ III. initially undefined function references (alphabetically):
;;; C-HEADER-DIR-NAME gets the path in which to place generated headers
;;; MAP-FILE-NAME gets the name of the textual 'cold-sbcl.map' file
(defun sb-cold:genesis (&key object-file-names tls-init
defstruct-descriptions
core-file-name c-header-dir-name map-file-name
symbol-table-file-name (verbose t))
(declare (ignorable symbol-table-file-name))
@ -3624,7 +3624,8 @@ III. initially undefined function references (alphabetically):
(initialize-layouts)
(initialize-packages)
(initialize-static-space tls-init)
(when core-file-name (read-structure-definitions))
(when core-file-name
(read-structure-definitions defstruct-descriptions))
;; Load all assembler code
(flet ((assembler-file-p (name) (tailwise-equal (namestring name) ".assem-obj")))