[vmkit-commits] [vmkit] r62050 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Jan 11 15:41:22 2009
New Revision: 62050

URL: http://llvm.org/viewvc/llvm-project?rev=62050&view=rev
Log:
Still provide an external static callback when static compiling.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModuleProvider.cpp Sun Jan 11 15:41:22 2009
@@ -150,8 +150,13 @@
     func = Function::Create(type, GlobalValue::GhostLinkage, key, TheModule);
   } else {
     const llvm::FunctionType* type = LSI->getStaticType();
-    func = Function::Create(type, GlobalValue::GhostLinkage, "staticCallback",
-                            TheModule);
+    if (M->isStaticCompiling()) {
+      func = Function::Create(type, GlobalValue::ExternalLinkage, "staticCallback",
+                              TheModule);
+    } else {
+      func = Function::Create(type, GlobalValue::GhostLinkage, "staticCallback",
+                              TheModule);
+    }
   }
   
   ++nbCallbacks;