Changeset 5634

Timestamp:

Dec 22, 2006, 12:39:41 AM (18 years ago)

Author:

Gary Byers

Message:

Insist on at least Panther for PPC32/Darwin.

Use dlopen() on 64-bit Darwin variants. Might want to do a runtime
test and use dlfcn functions if at least Tiger.

(The old dyld functions are deprecated under Leopard, and there's
reason to believe that they don't work correctly on at least ppc64/
Leopard; attempting to use NSCreateObjectFileImageFromFile to open
a 64-bit .dylib seems to lead to memory corruption rather than
returning NSObjectFileImageInappropriateFile.

The old functions work better than the dlfcn functions on pre-Tiger
systems.)

File:

• trunk/ccl/lisp-kernel/pmcl-kernel.c (modified) (3 diffs)

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

@@ -1188 +1188 @@
 #ifdef DARWIN
 #ifdef PPC64
-#define min_os_version "8.0"
+#define min_os_version "8.0"    /* aka Tiger */
 #else
-#define min_os_version "6.0"
+#define min_os_version "7.0"    /* aka Panther */
 #endif
 #endif
@@ -1597 +1597 @@
 xGetSharedLibrary(char *path, int *resultType)
 {
+#if WORD_SIZE == 32
   NSObjectFileImageReturnCode code;
   NSObjectFileImage              moduleImage;
@@ -1682 +1683 @@
     }
   return result;
+#else
+  const char *                   error;
+  void *                         result;
+
+  result = dlopen(path, RTLD_NOW | RTLD_GLOBAL);
+  
+  if (result == NULL) {
+    error = dlerror();
+    *resultType = 0;
+    return error;
+  }
+  *resultType = 1;
+  return result;
+#endif
 }
 #endif