X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=be46641abca9b94464611a23c67bd02e6fa0bf06;hb=829ced3e78a23ba153ba4db64e6ea6984c2313b6;hp=e81185d7ca7b9ce0912c916ec3e7d614fd66ffb9;hpb=bd2df60f7c3f579a9c7610925c79a0e783adaa0e;p=sbcl.git

diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp
index e81185d..be46641 100644
--- a/src/code/foreign.lisp
+++ b/src/code/foreign.lisp
@@ -16,8 +16,7 @@
 
 (defun extern-alien-name (name)
   (handler-case
-      #!+(or elf (and mach-o (not dlshim))) (coerce name 'base-string)
-      #!+(or (and mach-o dlshim) win32) (concatenate 'base-string "_" name)
+      (coerce name 'base-string)
     (error ()
       (error "invalid external alien name: ~S" name))))
 
@@ -34,11 +33,7 @@
   (let ((extern (extern-alien-name name)))
     (values
      (or (gethash extern table)
-         (gethash (concatenate 'base-string
-                               #!+(and mach-o dlshim) "_ldso_stub_"
-                               #!+(and mach-o (not dlshim)) "ldso_stub__"
-                               #!-mach-o "ldso_stub__"
-                               extern) table)))))
+         (gethash (concatenate 'base-string "ldso_stub__" extern) table)))))
 
 (defun find-foreign-symbol-address (name)
   "Returns the address of the foreign symbol NAME, or NIL. Does not enter the
@@ -58,7 +53,10 @@ Dynamic symbols are entered into the linkage-table if they aren't there already.
 
 On non-linkage-table ports signals an error if the symbol isn't found."
   (declare (ignorable datap))
-  (let ((static (find-foreign-symbol-in-table name  *static-foreign-symbols*)))
+  #!+sb-dynamic-core
+  (values (ensure-foreign-symbol-linkage name datap) t)
+  #!-sb-dynamic-core
+  (let ((static (find-foreign-symbol-in-table name *static-foreign-symbols*)))
     (if static
         (values static nil)
         #!+os-provides-dlopen
@@ -85,8 +83,7 @@ if the symbol isn't found."
   #!+linkage-table
   (multiple-value-bind (addr sharedp)
       (foreign-symbol-address symbol datap)
-    #+sb-xc-host
-    (aver (not sharedp))
+    #+sb-xc-host #!-sb-dynamic-core (aver (not sharedp)) ()
     ;; If the address is from linkage-table and refers to data
     ;; we need to do a bit of juggling. It is not the address of the
     ;; variable, but the address where the real address is stored.
@@ -108,7 +105,7 @@ if the symbol isn't found."
 ;;; Cleanups before saving a core
 #-sb-xc-host
 (defun foreign-deinit ()
-  #!+(and os-provides-dlopen (or (not linkage-table) win32))
+  #!+(and os-provides-dlopen (not linkage-table))
   (when (dynamic-foreign-symbols-p)
     (warn "~@<Saving cores with alien definitions referring to non-static ~
            foreign symbols is unsupported on this platform: references to ~
@@ -143,7 +140,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))))
@@ -156,9 +156,17 @@ if the symbol isn't found."
 
 #-sb-xc-host
 (defun !foreign-cold-init ()
+  #!-sb-dynamic-core
   (dolist (symbol *!initial-foreign-symbols*)
     (setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol)))
-  #!+(and os-provides-dlopen (not win32))
+  #!+sb-dynamic-core
+  (loop for table-address from sb!vm::linkage-table-space-start
+          by sb!vm::linkage-table-entry-size
+          and reference in sb!vm::*required-runtime-c-symbols*
+        do (setf (gethash reference *linkage-info*)
+                 (make-linkage-info :datap (cdr reference)
+                      :address table-address)))
+  #!+os-provides-dlopen
   (setf *runtime-dlhandle* (dlopen-or-lose))
   #!+os-provides-dlopen
   (setf *shared-objects* nil))