[vmkit-commits] [vmkit] r137025 - in /vmkit/trunk: lib/Mvm/CommonThread/ObjectLocks.cpp lib/Mvm/Runtime/MethodInfo.cpp mmtk/mmtk-j3/ObjectModel.cpp tools/precompiler/trainer/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Sat Aug  6 16:36:44 2011
New Revision: 137025

URL: http://llvm.org/viewvc/llvm-project?rev=137025&view=rev
Log:
Fixes to get vmkit compile on macos.


Modified:
    vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
    vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
    vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
    vmkit/trunk/tools/precompiler/trainer/Makefile

Modified: vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=137025&r1=137024&r2=137025&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp Sat Aug  6 16:36:44 2011
@@ -86,7 +86,7 @@
 void printDebugMessage(gc* object, LockSystem& table) {
   llvm_gcroot(object, 0);
   fprintf(stderr,
-      "WARNING: [%p] has been waiting really long for %p (header = %x)\n",
+      "WARNING: [%p] has been waiting really long for %p (header = %lx)\n",
       (void*)mvm::Thread::get(),
       (void*)object,
       object->header);

Modified: vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp?rev=137025&r1=137024&r2=137025&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp Sat Aug  6 16:36:44 2011
@@ -45,7 +45,7 @@
 
 FunctionMap::FunctionMap(BumpPtrAllocator& allocator, CompiledFrames** allFrames) {
   if (allFrames == NULL) return;
-  Functions.resize(40000); // Make sure the cache is big enough.
+  Functions.resize(32000); // Make sure the cache is big enough.
   int i = 0;
   CompiledFrames* compiledFrames = NULL;
   while ((compiledFrames = allFrames[i++]) != NULL) {

Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=137025&r1=137024&r2=137025&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Sat Aug  6 16:36:44 2011
@@ -78,7 +78,7 @@
 }
 
 extern "C" uintptr_t JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
-    gc* obj, VirtualTable* VT, int size, int allocator) ALWAYS_INLINE;
+    gc* obj, VirtualTable* VT, int size, int allocator);
 
 extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
     MMTkObject* OM, gc* src, int allocator) ALWAYS_INLINE;

Modified: vmkit/trunk/tools/precompiler/trainer/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/trainer/Makefile?rev=137025&r1=137024&r2=137025&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/trainer/Makefile (original)
+++ vmkit/trunk/tools/precompiler/trainer/Makefile Sat Aug  6 16:36:44 2011
@@ -27,7 +27,7 @@
 	$(Verb) $(MKDIR) $(ObjDir)
 	$(Verb) $(LOPT) generated.bc -load=$(LibDir)/StaticGCPass$(SHLIBEXT) -StaticGCPass -o $(LibDir)/Precompiled.bc
 	$(Verb) $(LLC) -disable-cfi -O0 -fast-isel=false -load=$(LibDir)/StaticGCPrinter$(SHLIBEXT) -disable-fp-elim $(LibDir)/Precompiled.bc -o $(ObjDir)/Precompiled.s
-	$(Verb) $(LLVMCC) -c $(ObjDir)/Precompiled.s -o $(ObjDir)/Precompiled.o
+	$(Verb) $(CC) -c $(ObjDir)/Precompiled.s -o $(ObjDir)/Precompiled.o
 	$(Verb) $(Archive) $(LibDir)/libPrecompiled.a $(ObjDir)/Precompiled.o
 	$(Verb) $(Ranlib) $(LibDir)/libPrecompiled.a
 	$(Verb) $(MV) generated.bc Precompiled.bc