X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fforeign.lisp;h=430614ec86e04b4156debdeeda0e3453f901f457;hb=935d6f6a696c2b0bff1c937cef346cb495e41999;hp=7503bdae93328af58b2c35e516e9d75ae8ddbc48;hpb=4898ef32c639b1c7f4ee13a5ba566ce6debd03e6;p=sbcl.git diff --git a/src/code/foreign.lisp b/src/code/foreign.lisp index 7503bda..430614e 100644 --- a/src/code/foreign.lisp +++ b/src/code/foreign.lisp @@ -11,13 +11,13 @@ (in-package "SB!IMPL") -#!-(or elf mach-o) -(error "Not an ELF or Mach-O platform?") +#!-(or elf mach-o win32) +(error "Not an ELF, Mach-O, or Win32 platform?") (defun extern-alien-name (name) (handler-case #!+elf (coerce name 'base-string) - #!+mach-o (concatenate 'base-string "_" name) + #!+(or mach-o win32) (concatenate 'base-string "_" name) (error () (error "invalid external alien name: ~S" name)))) @@ -95,7 +95,11 @@ if the symbol isn't found." #!+os-provides-dlopen (reopen-shared-objects) #!+linkage-table - (update-linkage-table)) + ;; Don't warn about undefined aliens on startup. The same core can + ;; reasonably be expected to work with different versions of the + ;; same library. + (handler-bind ((style-warning #'muffle-warning)) + (update-linkage-table))) ;;; Cleanups before saving a core #-sb-xc-host @@ -112,6 +116,7 @@ if the symbol isn't found." #!+os-provides-dlopen (close-shared-objects)) +(declaim (maybe-inline sap-foreign-symbol)) (defun sap-foreign-symbol (sap) (declare (ignorable sap)) #-sb-xc-host @@ -151,9 +156,10 @@ if the symbol isn't found." (defun !foreign-cold-init () (dolist (symbol *!initial-foreign-symbols*) (setf (gethash (car symbol) *static-foreign-symbols*) (cdr symbol))) + #!+(and os-provides-dlopen (not win32)) + (setf *runtime-dlhandle* (dlopen-or-lose)) #!+os-provides-dlopen - (setf *runtime-dlhandle* (dlopen-or-lose) - *shared-objects* nil)) + (setf *shared-objects* nil)) #!-os-provides-dlopen (define-unsupported-fun load-shared-object)