[llvm-commits] [vmkit] r51046 - /vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue May 13 09:56:41 2008
New Revision: 51046

URL: http://llvm.org/viewvc/llvm-project?rev=51046&view=rev
Log:
Use SELF_HANDLE on Darwin for dlsym'ing its own symbols.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp?rev=51046&r1=51045&r2=51046&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/NativeUtil.cpp Tue May 13 09:56:41 2008
@@ -30,6 +30,12 @@
   return JavaThread::get()->isolate;
 }
 
+#if defined(__MACH__)
+#define SELF_HANDLE RTLD_DEFAULT
+#else
+#define SELF_HANDLE 0
+#endif
+
 #define PRE "Java_"
 #define PRE_LEN 5
 
@@ -181,7 +187,7 @@
 #undef PRE_LEN
 
 static void* loadName(char* buf, bool& jnjvm) {
-  void* res = dlsym(0, buf);
+  void* res = dlsym(SELF_HANDLE, buf);
   if (!res) {
 #ifndef SERVICE_VM
     Jnjvm* vm = JavaThread::get()->isolate;