[vmkit-commits] [vmkit] r135879 - in /vmkit/trunk: Makefile.rules lib/J3/Compiler/AOT/StaticJ3GC.cpp mmtk/mmtk-j3/Memory.cpp tools/precompiler/trainer/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Sun Jul 24 13:18:14 2011
New Revision: 135879

URL: http://llvm.org/viewvc/llvm-project?rev=135879&view=rev
Log:
A few fixes to make J3 compile on OSX again.


Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/J3/Compiler/AOT/StaticJ3GC.cpp
    vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
    vmkit/trunk/tools/precompiler/trainer/Makefile

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=135879&r1=135878&r2=135879&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Sun Jul 24 13:18:14 2011
@@ -79,7 +79,7 @@
 	$(Verb) $(LOPT) $(LibDir)/FinalMMTk.bc -load=$(LibDir)/StaticGCPass$(SHLIBEXT) -std-compile-opts -StaticGCPass -o $(LibDir)/FinalMMTk.bc
 	$(Verb) $(MKDIR) $(ObjDir)
 	$(Verb) $(LLC) -disable-fp-elim -load=$(LibDir)/StaticGCPrinter$(SHLIBEXT) $(LibDir)/FinalMMTk.bc -o $(ObjDir)/FinalMMTk.s
-	$(Verb) $(Compile.C) $(ObjDir)/FinalMMTk.s -o $(ObjDir)/FinalMMTk.o
+	$(Verb) $(Compile.Wrapper) $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) $(TargetCommonOpts) $(CompileCommonOpts) -c $(ObjDir)/FinalMMTk.s -o $(ObjDir)/FinalMMTk.o
 	$(Verb) $(Archive) $(LibDir)/libFinalMMTk.a $(ObjDir)/FinalMMTk.o
 	$(Verb) $(Ranlib) $(LibDir)/libFinalMMTk.a
 	$(Verb) $(LLC) -march=cpp -cppgen=function -cppfor=gcmalloc $(LibDir)/FinalMMTk.bc -o $(PROJ_SRC_ROOT)/mmtk/inline/MMTkMallocInline.inc
@@ -136,10 +136,10 @@
 ifdef BUILD_FRAMETABLE
 
 FrametablesExterns.inc: $(ProjLibsPaths)
-	$(Verb) nm $(ProjLibsPaths) | grep __frametable | sed 's/\([a-f0-9]*\)\s\([a-zA-Z]*\)\s\([a-zA-Z0-9_]*\)/extern "C" CamlFrames \3;/' > $@
+	$(Verb) nm $(ProjLibsPaths) | grep __frametable | sed 's/\([a-f0-9]*\) \([a-zA-Z]*\) [_?]\([a-zA-Z0-9_]*\)/extern "C" CamlFrames \3;/' > $@
 
 FrametablesSymbols.inc: $(ProjLibsPaths)
-	$(Verb) nm $(ProjLibsPaths) | grep __frametable | sed 's/\([a-f0-9]*\)\s\([a-zA-Z]*\)\s\([a-zA-Z0-9_]*\)/\&\3,/' > $@
+	$(Verb) nm $(ProjLibsPaths) | grep __frametable | sed 's/\([a-f0-9]*\) \([a-zA-Z]*\) [_?]\([a-zA-Z0-9_]*\)/\&\3,/' > $@
 
 all-local:: FrametablesExterns.inc FrametablesSymbols.inc
 

Modified: vmkit/trunk/lib/J3/Compiler/AOT/StaticJ3GC.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/AOT/StaticJ3GC.cpp?rev=135879&r1=135878&r2=135879&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/AOT/StaticJ3GC.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/AOT/StaticJ3GC.cpp Sun Jul 24 13:18:14 2011
@@ -87,7 +87,9 @@
     GCFunctionInfo &FI = **I;
 
     // Emit the frame symbol
-    MCSymbol *Sym = AP.OutContext.GetOrCreateSymbol(FI.getFunction().getName() + "_frame");
+    SmallString<128> TmpStr;
+    AP.Mang->getNameWithPrefix(TmpStr, FI.getFunction().getName() + "_frame");
+    MCSymbol *Sym = AP.OutContext.GetOrCreateSymbol(TmpStr);
     AP.OutStreamer.EmitSymbolAttribute(Sym, MCSA_Global);
     AP.OutStreamer.EmitLabel(Sym);
 

Modified: vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Memory.cpp?rev=135879&r1=135878&r2=135879&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Memory.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Memory.cpp Sun Jul 24 13:18:14 2011
@@ -15,7 +15,12 @@
 
 namespace mmtk {
 
+#if defined (__MACH__)
+static const uintptr_t MemoryStart = 0x30000000;
+#else
 static const uintptr_t MemoryStart = 0x50000000;
+#endif
+
 static const uintptr_t MemorySize = 0x40000000;
 
 class InitCollector {

Modified: vmkit/trunk/tools/precompiler/trainer/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/trainer/Makefile?rev=135879&r1=135878&r2=135879&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/trainer/Makefile (original)
+++ vmkit/trunk/tools/precompiler/trainer/Makefile Sun Jul 24 13:18:14 2011
@@ -25,7 +25,8 @@
 	$(Verb) $(MKDIR) $(ObjDir)
 	$(Verb) $(LOPT) generated.bc -load=$(LibDir)/StaticGCPass$(SHLIBEXT) -StaticGCPass -o $(LibDir)/Precompiled.bc
 	$(Verb) $(LLC) -O0 -fast-isel=false -load=$(LibDir)/StaticJ3GC$(SHLIBEXT) -load=$(LibDir)/StaticGCPrinter$(SHLIBEXT) -disable-fp-elim $(LibDir)/Precompiled.bc -o $(ObjDir)/Precompiled.s
-	$(Verb) $(Compile.C) $(ObjDir)/Precompiled.s -o $(ObjDir)/Precompiled.o
+	$(Verb) $(Compile.Wrapper) $(LLVMCC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) $(TargetCommonOpts) $(CompileCommonOpts) -c $(ObjDir)/Precompiled.s -o $(ObjDir)/Precompiled.o
+
 	$(Verb) $(Archive) $(LibDir)/libPrecompiled.a $(ObjDir)/Precompiled.o
 	$(Verb) $(Ranlib) $(LibDir)/libPrecompiled.a