Changeset 14566

Timestamp:

Jan 10, 2011, 7:40:50 AM (9 years ago)

Author:

gb

Message:

In ELF version of OPEN-SHARED-LIBRARY-INTERNAL, handle Android
case when mapping from handle returned by dlopen to link map.

Use the new headers for link_map, r_debug structs.

File:

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

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

@@ -139 +139 @@
 #+(or linux-target freebsd-target solaris-target)
 (progn
-#+android-target
-(eval-when (:compile-toplevel :execute)
-  (def-foreign-type nil
-      (:struct :link_map
-         (:l_addr :unsigned)
-         (:l_name (:* :char))
-         (:l_ld :address)
-         (:l_next (:* (:struct :link_map)))
-         (:l_prev (:* (:struct :link_map)))))
-  (def-foreign-type nil
-      (:struct :r_debug
-         (:r_version :int32_t)
-         (:r_map (:* (:struct :link_map)))
-         (:r_brk :address)
-         (:r_state :int32_t)
-         (:r_ldbase :address))))
 
 (defun soname-ptr-from-link-map (map)
@@ -337 +321 @@
                          :unsigned-fullword *dlopen-flags*
                          :address)))
-         (link-map #-(or freebsd-target solaris-target) handle
+         (link-map #+(and linux-target (not android-target)) handle
                    #+(or freebsd-target solaris-target)
                    (if (%null-ptr-p handle)
@@ -349 +333 @@
                                    :int))
                          (pref p :address)
-                         (%null-ptr))))))
+                         (%null-ptr))))
+                   #+android-target (pref handle :soinfo.linkmap)))
     (if (%null-ptr-p link-map)
       (values nil (dlerror))