(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))))
(let ((extern (extern-alien-name name)))
(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__"
- 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
;;; 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 ~
(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)