Changeset 15271

Timestamp:

Mar 23, 2012, 3:55:24 PM (13 years ago)

Author:

Gary Byers

Message:

Android's #_dlopen() returns a pointer to an soinfo structure.
Deal with that in %REOPEN-USER-LIBRARIES; let xGetSharedLibrary call
dlopen().

Location:

trunk/source

Files:

• level-0/l0-cfm-support.lisp (modified) (1 diff)
• lisp-kernel/pmcl-kernel.c (modified) (1 diff)

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

@@ -896 +896 @@
                        :unsigned-fullword *dlopen-flags*
                        :address))
-                #-(or freebsd-target solaris-target) (setq map handle)
+                #-(or freebsd-target solaris-target android-target) (setq map handle)
+                #+android-target (setq map
+                                       (if (%null-ptr-p handle)
+                                         handle
+                                         (pref handle :soinfo.linkmap)))
                 #+(or freebsd-target solaris-target)
                 (setq map

trunk/source/lisp-kernel/pmcl-kernel.c

@@ -2156 +2156 @@
 xGetSharedLibrary(char *path, int mode)
 {
-#ifdef ANDROID
-  /* Hopefully temporary bug workaround */
-  return NULL;
-#else
   return dlopen(path, mode);
-#endif
 }
 #endif