[vmkit-commits] [vmkit] r83630 - in /vmkit/trunk/lib: JnJVM/Compiler/JnjvmModule.cpp Mvm/GCMmap2/gcthread.h

[Nicolas Geoffray]

Author: geoffray
Date: Fri Oct  9 05:28:22 2009
New Revision: 83630

URL: http://llvm.org/viewvc/llvm-project?rev=83630&view=rev
Log:
Enable cooperative GC if we're compiling with llvm-gcc.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=83630&r1=83629&r2=83630&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Fri Oct  9 05:28:22 2009
@@ -67,7 +67,11 @@
   JavaIntrinsics(TheModule) {
 
   enabledException = true;
+#ifdef WITH_LLVM_GCC
+  cooperativeGC = true;
+#else
   cooperativeGC = false;
+#endif
 }
   
 void JavaLLVMCompiler::resolveVirtualClass(Class* cl) {

Modified: vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h?rev=83630&r1=83629&r2=83630&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h (original)
+++ vmkit/trunk/lib/Mvm/GCMmap2/gcthread.h Fri Oct  9 05:28:22 2009
@@ -53,7 +53,11 @@
     _nb_collected = 0;
     current_collector = 0;
     base = 0;
+#ifdef WITH_LLVM_GCC
+    cooperative = true;
+#else
     cooperative = false;
+#endif
   }
   
   inline unsigned int get_nb_threads() {