X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-load.lisp;h=7810634cf2f5d8e571763e0b9b6192c7497973db;hb=872175cd9cb5b4966a36d4bd92421cc407a0355b;hp=b47f4c48bfe00808c44c6b62ed6bb33158196292;hpb=aa2dc9529460ea0d9c99998dc87283fc1a43e808;p=sbcl.git

diff --git a/src/code/target-load.lisp b/src/code/target-load.lisp
index b47f4c4..7810634 100644
--- 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))
-	(eval sexpr))))
+      (eval sexpr))))
 
 ;;;; LOAD itself
 
@@ -80,7 +80,7 @@
 	   (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
@@ -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)
-	(try-default-type pathname *backend-fasl-file-type*)
+	(try-default-type pathname *fasl-file-type*)
       (cond
        ((and obj-tn
 	     src-tn
@@ -331,14 +331,12 @@
 
 (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)
-  (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)))