[vmkit-commits] [vmkit] r99130 - in /vmkit/trunk: Makefile.rules lib/N3/Mono/Makefile lib/N3/PNetLib/Makefile lib/N3/PNetLib/PNetLib.cpp lib/N3/PNetLib/PNetString.cpp mmtk/java/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Sun Mar 21 11:31:03 2010
New Revision: 99130

URL: http://llvm.org/viewvc/llvm-project?rev=99130&view=rev
Log:
Fix build.


Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/N3/Mono/Makefile
    vmkit/trunk/lib/N3/PNetLib/Makefile
    vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
    vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
    vmkit/trunk/mmtk/java/Makefile

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=99130&r1=99129&r2=99130&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Sun Mar 21 11:31:03 2010
@@ -130,10 +130,10 @@
 ADDITIONAL_ARGS := -load-bc=$(LibDir)/MMTKRuntime.bc 
 
 all::
-	$(Verb) $(ANT)
+	$(Verb) $(ANT) -buildfile $(PROJ_SRC_ROOT)/mmtk/java/build.xml
 	$(Echo) Building $(BuildMode) $(JARNAME).jar $(notdir $@)
 	$(Verb) $(LOPT) -load=$(LibDir)/JITGCPass$(SHLIBEXT) -std-compile-opts -JITGCPass -f $(LibDir)/MMTKAlloc.bc -o $(LibDir)/MMTKAlloc.bc
-	$(Verb) $(VMJC) -std-compile-opts $(ADDITIONAL_ARGS) -load=$(LibDir)/MMTKFake$(SHLIBEXT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -LowerMagic -verify $(JARNAME).jar -disable-exceptions -disable-cooperativegc -with-clinit=org/mmtk/vm/VM,org/mmtk/utility/*,org/mmtk/policy/*,org/j3/config/* -Dmmtk.hostjvm=org.j3.mmtk.Factory -o $(JARNAME).bc -Dmmtk.properties=vmkit.properties -disable-stubs -assume-compiled -llvm-lazy
+	$(Verb) $(VMJC) -std-compile-opts $(ADDITIONAL_ARGS) -load=$(LibDir)/MMTKFake$(SHLIBEXT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -LowerMagic -verify $(PROJ_SRC_ROOT)/mmtk/java/$(JARNAME).jar -disable-exceptions -disable-cooperativegc -with-clinit=org/mmtk/vm/VM,org/mmtk/utility/*,org/mmtk/policy/*,org/j3/config/* -Dmmtk.hostjvm=org.j3.mmtk.Factory -o $(JARNAME).bc -Dmmtk.properties=$(PROJ_SRC_ROOT)/mmtk/java/vmkit.properties -disable-stubs -assume-compiled -llvm-lazy
 	$(Verb) $(LOPT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -std-compile-opts -LowerJavaRT -f $(JARNAME).bc -o $(JARNAME)-optimized.bc
 	$(Verb) $(LLVMLD) -r -o $(LibDir)/FinalMMTk.bc $(LibDir)/MMTKAlloc.bc $(JARNAME)-optimized.bc $(LibDir)/MMTKRuntime.bc
 	$(Verb) $(LOPT) -std-compile-opts $(LibDir)/FinalMMTk.bc -o $(LibDir)/FinalMMTk.bc

Modified: vmkit/trunk/lib/N3/Mono/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Makefile?rev=99130&r1=99129&r2=99130&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/Makefile (original)
+++ vmkit/trunk/lib/N3/Mono/Makefile Sun Mar 21 11:31:03 2010
@@ -16,6 +16,7 @@
   LIBRARYNAME = Mono
 endif
 
+EXTRA_DIST = MonoPath.inc.in
 include $(LEVEL)/Makefile.common
 CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore
 

Modified: vmkit/trunk/lib/N3/PNetLib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/Makefile?rev=99130&r1=99129&r2=99130&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/Makefile (original)
+++ vmkit/trunk/lib/N3/PNetLib/Makefile Sun Mar 21 11:31:03 2010
@@ -16,5 +16,6 @@
   LIBRARYNAME = PNetLib
 endif
 
+EXTRA_DIST = PNetPath.inc.in
 include $(LEVEL)/Makefile.common
 CXX.Flags += -I$(PROJ_SRC_DIR)/../VMCore

Modified: vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp?rev=99130&r1=99129&r2=99130&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp Sun Mar 21 11:31:03 2010
@@ -49,6 +49,8 @@
 
 #include "PNetPath.inc"
 
+#include "llvm/LLVMContext.h"
+
 using namespace n3;
 
 #define IL_CONSOLE_NORMAL 0

Modified: vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetString.cpp?rev=99130&r1=99129&r2=99130&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetString.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetString.cpp Sun Mar 21 11:31:03 2010
@@ -9,6 +9,7 @@
 
 #include "llvm/DerivedTypes.h"
 #include "llvm/GlobalVariable.h"
+#include "llvm/LLVMContext.h"
 
 #include "mvm/JIT.h"
 

Modified: vmkit/trunk/mmtk/java/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/Makefile?rev=99130&r1=99129&r2=99130&view=diff
==============================================================================
--- vmkit/trunk/mmtk/java/Makefile (original)
+++ vmkit/trunk/mmtk/java/Makefile Sun Mar 21 11:31:03 2010
@@ -12,5 +12,6 @@
 
 RUN_ANT = 1
 JARNAME = mmtk-vmkit
+EXTRA_DIST = vmkit.properties build.xml src
 
 include $(LEVEL)/Makefile.common