[vmkit-commits] [vmkit] r116159 - in /vmkit/branches/release_028: Makefile.rules lib/J3/VMCore/LinkJavaRuntime.h mmtk/java/Makefile mmtk/java/build.xml.in

[Nicolas Geoffray]

Author: geoffray
Date: Sat Oct  9 18:23:51 2010
New Revision: 116159

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


Modified:
    vmkit/branches/release_028/Makefile.rules
    vmkit/branches/release_028/lib/J3/VMCore/LinkJavaRuntime.h
    vmkit/branches/release_028/mmtk/java/Makefile
    vmkit/branches/release_028/mmtk/java/build.xml.in

Modified: vmkit/branches/release_028/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_028/Makefile.rules?rev=116159&r1=116158&r2=116159&view=diff
==============================================================================
--- vmkit/branches/release_028/Makefile.rules (original)
+++ vmkit/branches/release_028/Makefile.rules Sat Oct  9 18:23:51 2010
@@ -131,10 +131,10 @@
   ADDITIONAL_ARGS := -load-bc=$(LibDir)/MMTKRuntime.bc 
 
   all::
-	$(Verb) $(ANT) -buildfile $(PROJ_SRC_ROOT)/mmtk/java/build.xml
+	$(Verb) $(ANT) -buildfile $(PROJ_OBJ_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)/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) $(VMJC) -std-compile-opts $(ADDITIONAL_ARGS) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -LowerMagic -verify $(PROJ_OBJ_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/branches/release_028/lib/J3/VMCore/LinkJavaRuntime.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_028/lib/J3/VMCore/LinkJavaRuntime.h?rev=116159&r1=116158&r2=116159&view=diff
==============================================================================
--- vmkit/branches/release_028/lib/J3/VMCore/LinkJavaRuntime.h (original)
+++ vmkit/branches/release_028/lib/J3/VMCore/LinkJavaRuntime.h Sat Oct  9 18:23:51 2010
@@ -80,7 +80,7 @@
 #endif
 
 
-namespace {
+namespace force_linker {
   struct ForceRuntimeLinking {
     ForceRuntimeLinking() {
       // We must reference the passes in such a way that compilers will not

Modified: vmkit/branches/release_028/mmtk/java/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_028/mmtk/java/Makefile?rev=116159&r1=116158&r2=116159&view=diff
==============================================================================
--- vmkit/branches/release_028/mmtk/java/Makefile (original)
+++ vmkit/branches/release_028/mmtk/java/Makefile Sat Oct  9 18:23:51 2010
@@ -12,6 +12,6 @@
 
 RUN_ANT = 1
 JARNAME = mmtk-vmkit
-EXTRA_DIST = vmkit.properties build.xml src
+EXTRA_DIST = vmkit.properties build.xml.in src
 
 include $(LEVEL)/Makefile.common

Modified: vmkit/branches/release_028/mmtk/java/build.xml.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_028/mmtk/java/build.xml.in?rev=116159&r1=116158&r2=116159&view=diff
==============================================================================
--- vmkit/branches/release_028/mmtk/java/build.xml.in (original)
+++ vmkit/branches/release_028/mmtk/java/build.xml.in Sat Oct  9 18:23:51 2010
@@ -1,7 +1,7 @@
 <project name="MMTK-VMKit" default="main" basedir=".">
   <target name="main">
     <mkdir dir="classes"/>
-    <javac srcdir="src:../config/@MMTK_PLAN@" destdir="classes" source="1.5"/>
+    <javac srcdir="@abs_top_srcdir@/mmtk/java/src:@abs_top_srcdir@/mmtk/config/@MMTK_PLAN@" destdir="classes" source="1.5"/>
     <jar jarfile="mmtk-vmkit.jar">
       <fileset dir="classes"/>
     </jar>