projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre7.31:
[sbcl.git]
/
src
/
code
/
target-load.lisp
diff --git
a/src/code/target-load.lisp
b/src/code/target-load.lisp
index
b47f4c4
..
7810634
100644
(file)
--- a/
src/code/target-load.lisp
+++ b/
src/code/target-load.lisp
@@
-38,7
+38,7
@@
(let ((results (multiple-value-list (eval sexpr))))
(load-fresh-line)
(format t "~{~S~^, ~}~%" results))
(let ((results (multiple-value-list (eval sexpr))))
(load-fresh-line)
(format t "~{~S~^, ~}~%" results))
- (eval sexpr))))
+ (eval sexpr))))
\f
;;;; LOAD itself
\f
;;;; LOAD itself
@@
-80,7
+80,7
@@
(internal-load pathname truename if-does-not-exist verbose print
:binary))
(t
(internal-load pathname truename if-does-not-exist verbose print
:binary))
(t
- (when (string= (pathname-type truename) *backend-fasl-file-type*)
+ (when (string= (pathname-type truename) *fasl-file-type*)
(error "File has a fasl file type, but no fasl file header:~% ~S"
(namestring truename)))
(internal-load pathname truename if-does-not-exist verbose print
(error "File has a fasl file type, but no fasl file header:~% ~S"
(namestring truename)))
(internal-load pathname truename if-does-not-exist verbose print
@@
-106,7
+106,7
@@
(multiple-value-bind (src-pn src-tn)
(try-default-type pathname *load-source-default-type*)
(multiple-value-bind (obj-pn obj-tn)
(multiple-value-bind (src-pn src-tn)
(try-default-type pathname *load-source-default-type*)
(multiple-value-bind (obj-pn obj-tn)
- (try-default-type pathname *backend-fasl-file-type*)
+ (try-default-type pathname *fasl-file-type*)
(cond
((and obj-tn
src-tn
(cond
((and obj-tn
src-tn
@@
-331,14
+331,12
@@
(declaim (ftype (function (string) sb!vm:word)
foreign-symbol-address-as-integer))
(declaim (ftype (function (string) sb!vm:word)
foreign-symbol-address-as-integer))
+
+
+;;; sb!sys:get-dynamic-foreign-symbol-address is in foreign.lisp, on
+;;; platforms that have dynamic loading
(defun foreign-symbol-address-as-integer (foreign-symbol)
(defun foreign-symbol-address-as-integer (foreign-symbol)
- (or (gethash foreign-symbol *static-foreign-symbols*)
- (gethash (concatenate 'simple-string
- #!+linux "ldso_stub__"
- #!+openbsd "_"
- #!+freebsd "ldso_stub__"
- foreign-symbol)
- *static-foreign-symbols*)
+ (or (find-foreign-symbol-in-table foreign-symbol *static-foreign-symbols*)
(sb!sys:get-dynamic-foreign-symbol-address foreign-symbol)
(error "unknown foreign symbol: ~S" foreign-symbol)))
(sb!sys:get-dynamic-foreign-symbol-address foreign-symbol)
(error "unknown foreign symbol: ~S" foreign-symbol)))