[vmkit-commits] [vmkit] r59134 - in /vmkit/trunk: autoconf/configure.ac configure lib/JnJVM/Makefile tools/jnjvm/Makefile tools/vmjc/Makefile tools/vmkit/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Wed Nov 12 08:14:56 2008
New Revision: 59134

URL: http://llvm.org/viewvc/llvm-project?rev=59134&view=rev
Log:
Fix isolate compilation.


Modified:
    vmkit/trunk/autoconf/configure.ac
    vmkit/trunk/configure
    vmkit/trunk/lib/JnJVM/Makefile
    vmkit/trunk/tools/jnjvm/Makefile
    vmkit/trunk/tools/vmjc/Makefile
    vmkit/trunk/tools/vmkit/Makefile

Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=59134&r1=59133&r2=59134&view=diff

==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Wed Nov 12 08:14:56 2008
@@ -214,19 +214,19 @@
 dnl **************************************************************************
 AC_ARG_WITH(vm-type,
        [AS_HELP_STRING(--with-vm-type=something,
-           [VM type ('single' 'multi' or 'service')])],
+           [VM type ('single' 'isolate' 'isolate-sharing' or 'service')])],
        [[vmtype=$withval]],
        [[ echo Using single as vm type.
                 vmtype=single
        ]]
 )
 
-if test "x$vmtype" = "xmulti";  then
-  VM_FLAGS="-DMULTIPLE_VM"
+if test "x$vmtype" = "xisolate";  then
+  VM_FLAGS="-DISOLATE"
   ISOLATE_BUILD=1
 else 
   if test "x$vmtype" = "xservice"; then
-    VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
+    VM_FLAGS="-DISOLATE -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
     SERVICE_BUILD=1
   fi
 fi

Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=59134&r1=59133&r2=59134&view=diff

==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Wed Nov 12 08:14:56 2008
@@ -1321,7 +1321,8 @@
   --with-thread=something Thread type ('common' or 'no')
   --with-gc=something     GC type ('single-mmap' 'multi-mmap' or 'boehm')
   --with-vm-type=something
-                          VM type ('single' 'multi' or 'service')
+                          VM type ('single' 'isolate' 'isolate-sharing' or
+                          'service')
   --with-gnu-classpath-libs=something
                           GNU CLASSPATH libraries (default is
                           /usr/lib/classpath)
@@ -3942,12 +3943,12 @@
 fi
 
 
-if test "x$vmtype" = "xmulti";  then
-  VM_FLAGS="-DMULTIPLE_VM"
+if test "x$vmtype" = "xisolate";  then
+  VM_FLAGS="-DISOLATE"
   ISOLATE_BUILD=1
 else
   if test "x$vmtype" = "xservice"; then
-    VM_FLAGS="-DMULTIPLE_VM -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
+    VM_FLAGS="-DISOLATE -DSERVICE_GC -DMULTIPLE_GC -DSERVICE_VM -I\$(PROJ_SRC_ROOT)/lib/Mvm/Allocator"
     SERVICE_BUILD=1
   fi
 fi

Modified: vmkit/trunk/lib/JnJVM/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Makefile?rev=59134&r1=59133&r2=59134&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Makefile (original)
+++ vmkit/trunk/lib/JnJVM/Makefile Wed Nov 12 08:14:56 2008
@@ -12,7 +12,7 @@
 
 include $(LEVEL)/Makefile.config
 
-ifeq ($(ISOLATE_BUILD), 1) 
+ifeq ($(ISOLATE_SHARING_BUILD), 1) 
     DIRS += Isolate
 endif
 

Modified: vmkit/trunk/tools/jnjvm/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/jnjvm/Makefile?rev=59134&r1=59133&r2=59134&view=diff

==============================================================================
--- vmkit/trunk/tools/jnjvm/Makefile (original)
+++ vmkit/trunk/tools/jnjvm/Makefile Wed Nov 12 08:14:56 2008
@@ -14,7 +14,7 @@
 USEDLIBS = Allocator CommonThread Mvm JnJVM Classpath $(GCLIB)
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo
 
-ifeq ($(ISOLATE_BUILD), 1) 
+ifeq ($(ISOLATE_SHARING_BUILD), 1) 
     USEDLIBS += Isolate
 endif
 

Modified: vmkit/trunk/tools/vmjc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/Makefile?rev=59134&r1=59133&r2=59134&view=diff

==============================================================================
--- vmkit/trunk/tools/vmjc/Makefile (original)
+++ vmkit/trunk/tools/vmjc/Makefile Wed Nov 12 08:14:56 2008
@@ -14,8 +14,4 @@
 USEDLIBS = Allocator CommonThread Mvm JnJVM Classpath $(GCLIB)
 LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo bitwriter
 
-ifeq ($(ISOLATE_BUILD), 1) 
-    USEDLIBS += Isolate
-endif
-
 include $(LEVEL)/Makefile.common

Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=59134&r1=59133&r2=59134&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Wed Nov 12 08:14:56 2008
@@ -17,7 +17,7 @@
 USEDLIBS += JnJVM Classpath
 endif
 
-ifeq ($(ISOLATE_BUILD), 1) 
+ifeq ($(ISOLATE_SHARING_BUILD), 1) 
     USEDLIBS += Isolate
 endif