1.0.30.41: Octets support for ebcdic-us

[sbcl.git] / src / code / foreign.lisp

diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp
index 805c5ab..bd89cd8 100644 (file)
--- a/src/code/foreign.lisp
+++ b/src/code/foreign.lisp
@@ -35,8 +35,8 @@
     (values
      (or (gethash extern table)
          (gethash (concatenate 'base-string
-                               #!+(and darwin (or x86 x86-64)) "_ldso_stub__"
-                               #!-(and darwin (or x86 x86-64)) "ldso_stub__"
+                               #!+(and darwin (or x86 x86-64 ppc)) "_ldso_stub__"
+                               #!-(and darwin (or x86 x86-64 ppc)) "ldso_stub__"
                                extern) table)))))
 
 (defun find-foreign-symbol-address (name)
@@ -107,7 +107,7 @@ if the symbol isn't found."
 ;;; Cleanups before saving a core
 #-sb-xc-host
 (defun foreign-deinit ()
-  #!+(and os-provides-dlopen (not linkage-table))
+  #!+(and os-provides-dlopen (or (not linkage-table) win32))
   (when (dynamic-foreign-symbols-p)
     (warn "~@<Saving cores with alien definitions referring to non-static ~
            foreign symbols is unsupported on this platform: references to ~
@@ -129,13 +129,11 @@ if the symbol isn't found."
     (when (<= sb!vm:linkage-table-space-start
               addr
               sb!vm:linkage-table-space-end)
-      (maphash (lambda (name-and-datap info)
-                 (let ((table-addr (linkage-info-address info)))
-                   (when (<= table-addr
-                             addr
-                             (+ table-addr sb!vm:linkage-table-entry-size))
-                     (return-from sap-foreign-symbol (car name-and-datap)))))
-               *linkage-info*))
+      (dohash ((name-and-datap info) *linkage-info* :locked t)
+        (let ((table-addr (linkage-info-address info)))
+          (when (and (<= table-addr addr)
+                     (< addr (+ table-addr sb!vm:linkage-table-entry-size)))
+            (return-from sap-foreign-symbol (car name-and-datap))))))
     #!+os-provides-dladdr
     (with-alien ((info (struct dl-info
                                (filename c-string)