X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Fforeign.lisp;h=a735e7646fccdcae00bb506c6b0a0ae3c2a3bfe9;hb=625c9493a8a7b5186144d21302437cf4f4f3571c;hp=430614ec86e04b4156debdeeda0e3453f901f457;hpb=25fe91bf63fd473d9316675b0e0ca9be0079e9eb;p=sbcl.git

diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp
index 430614e..a735e76 100644
--- a/src/code/foreign.lisp
+++ b/src/code/foreign.lisp
@@ -16,8 +16,8 @@
 
 (defun extern-alien-name (name)
   (handler-case
-      #!+elf (coerce name 'base-string)
-      #!+(or mach-o win32) (concatenate 'base-string "_" name)
+      #!-win32 (coerce name 'base-string)
+      #!+win32 (concatenate 'base-string "_" name)
     (error ()
       (error "invalid external alien name: ~S" name))))
 
@@ -104,7 +104,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 ~
@@ -126,13 +126,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)
@@ -141,7 +139,10 @@ if the symbol isn't found."
                                (symbol-address unsigned)))
                  (dladdr (function unsigned unsigned (* (struct dl-info)))
                          :extern "dladdr"))
-      (let ((err (alien-funcall dladdr addr (addr info))))
+      (let ((err (without-gcing
+                   ;; On eg. Darwin GC can could otherwise interrupt
+                   ;; the call while dladdr is holding a lock.
+                   (alien-funcall dladdr addr (addr info)))))
         (if (zerop err)
             nil
             (slot info 'symbol))))