[vmkit-commits] [vmkit] r108344 - /vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Jul 14 13:29:40 2010
New Revision: 108344

URL: http://llvm.org/viewvc/llvm-project?rev=108344&view=rev
Log:
Don't include MMTkInline.inc if we're not using MMTk.


Modified:
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=108344&r1=108343&r2=108344&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Wed Jul 14 13:29:40 2010
@@ -70,9 +70,11 @@
     #include "LLVMRuntime.inc"
   }
   
+#ifdef WITH_MMTK
   namespace mmtk_runtime {
     #include "MMTkInline.inc"
   }
+#endif
   void linkVmkitGC();
 }
 
@@ -174,20 +176,21 @@
   }
 }
 
-static const char* MMTkSymbol =
-  "JnJVM_org_j3_bindings_Bindings_gcmalloc__"
-  "ILorg_vmmagic_unboxed_ObjectReference_2";
-
 BaseIntrinsics::BaseIntrinsics(llvm::Module* module) {
 
   module->setDataLayout(MvmModule::globalModule->getDataLayout());
   module->setTargetTriple(MvmModule::globalModule->getTargetTriple());
   LLVMContext& Context = module->getContext();
   
+#ifdef WITH_MMTK
+  static const char* MMTkSymbol =
+    "JnJVM_org_j3_bindings_Bindings_gcmalloc__"
+    "ILorg_vmmagic_unboxed_ObjectReference_2";
   if (dlsym(SELF_HANDLE, MMTkSymbol)) {
     // If we have found MMTk, read the gcmalloc function.
     mvm::mmtk_runtime::makeLLVMFunction(module);
   }
+#endif
   mvm::llvm_runtime::makeLLVMModuleContents(module);