Changeset 10048 for trunk/source/level-0/l0-cfm-support.lisp

Timestamp:

Jul 16, 2008, 2:22:02 PM (13 years ago)

Author:

gb

Message:

Conditionalize for Solaris.

Use *rtld-default* instead of *rtld-next* in many places; they seem
to yield the same results on other ELF-based systems, but differ
slightly on Solaris.

File:

• trunk/source/level-0/l0-cfm-support.lisp (modified) (13 diffs)

trunk/source/level-0/l0-cfm-support.lisp

@@ -44 +44 @@
   (istruct-typep x 'external-entry-point))
 
+;;; On both Linux and FreeBSD, RTLD_NEXT and RTLD_DEFAULT behave
+;;; the same way wrt symbols defined somewhere other than the lisp
+;;; kernel.  On Solaris, RTLD_DEFAULT will return the address of
+;;; an imported symbol's procedure linkage table entry if the symbol
+;;; has a plt entry (e.g., if it happens to be referenced by the
+;;; lisp kernel.)  *RTLD-NEXT* is therefore a slightly better
+;;; default; we've traditionaly used *RTLD-DEFAULT*.
 (defvar *rtld-next*)
 (defvar *rtld-default*)
@@ -50 +57 @@
                                   #-(or linux-target darwin-target)  -2))
 
-#+(or linux-target freebsd-target)
+#+(or linux-target freebsd-target solaris-target)
 (progn
 
@@ -99 +106 @@
 (defvar *shared-libraries* nil)
 
-#+(or linux-target freebsd-target)
+#+(or linux-target freebsd-target solaris-target)
 (progn
 
@@ -137 +144 @@
                                              dynamic-entries
                                              target::node-size)))
-                                 #+freebsd-target
+                                 #+(or freebsd-target solaris-target)
                                  (%inc-ptr (pref map :link_map.l_addr) disp)
-                                 #-freebsd-target
+                                 #-(or freebsd-target solaris-target)
                                  (%int-to-ptr 
                                   (if (< disp 0) 
@@ -432 +439 @@
 (defun ensure-open-shlib (c force)
   (if (or (shlib.map c) (not force))
-    *rtld-default*
+    *rtld-next*
     (error "Shared library not open: ~s" (shlib.soname c))))
 
@@ -438 +445 @@
   (if c
     (ensure-open-shlib c force)
-    *rtld-default*
+    *rtld-next*
     ))
 
@@ -454 +461 @@
 ;;; linkers don't quite get the concept ...)
 
-(defun foreign-symbol-entry (name &optional (handle *rtld-default*))
+(defun foreign-symbol-entry (name &optional (handle *rtld-next*))
   "Try to resolve the address of the foreign symbol name. If successful,
 return a fixnum representation of that address, else return NIL."
@@ -476 +483 @@
 (defvar *statically-linked* nil)
 
-#+(or linux-target freebsd-target)
+#+(or linux-target freebsd-target solaris-target)
 (progn
 
@@ -581 +588 @@
 )
 
-#-(or linux-target darwin-target freebsd-target)
+#-(or linux-target darwin-target freebsd-target solaris-target)
 (defun shlib-containing-entry (entry &optional name)
   (declare (ignore entry name))
@@ -603 +610 @@
 
 
-(defun foreign-symbol-address (name &optional (map *rtld-default*))
+(defun foreign-symbol-address (name &optional (map *rtld-next*))
   "Try to resolve the address of the foreign symbol name. If successful,
 return that address encapsulated in a MACPTR, else returns NIL."
@@ -630 +637 @@
     eep))
 
+
+
 (defun load-fv (name type)
   (let* ((fv (or (gethash name (fvs)) (setf (gethash name *fvs*) (%cons-foreign-variable name type)))))
@@ -640 +649 @@
 
 
-#+(or linux-target freebsd-target)
+#+(or linux-target freebsd-target solaris-target)
 (progn
 ;;; It's assumed that the set of libraries that the OS has open
@@ -728 +737 @@
   (%revive-macptr *rtld-next*)
   (%revive-macptr *rtld-default*)
-  #+(or linux-target freebsd-target)
+  #+(or linux-target freebsd-target solaris-target)
   (unless *statically-linked*
     (setq *dladdr-entry* (foreign-symbol-entry "dladdr"))