[vmkit-commits] [vmkit] r134151 - in /vmkit/trunk: Makefile.common.in Makefile.config.in autoconf/configure.ac configure lib/J3/LLVMRuntime/Makefile
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Thu Jun 30 06:59:55 PDT 2011
Author: geoffray
Date: Thu Jun 30 08:59:55 2011
New Revision: 134151
URL: http://llvm.org/viewvc/llvm-project?rev=134151&view=rev
Log:
Remove all VM build configs directives.
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.config.in
vmkit/trunk/autoconf/configure.ac
vmkit/trunk/configure
vmkit/trunk/lib/J3/LLVMRuntime/Makefile
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=134151&r1=134150&r2=134151&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Jun 30 08:59:55 2011
@@ -25,7 +25,7 @@
# Include LLVM's Master Makefile.
include $(LLVM_OBJ_ROOT)/Makefile.common
-CXX.Flags += @GC_FLAGS@ @VM_FLAGS@ @EXCEPTION_FLAGS@ -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -DENABLE_THREADS -fno-rtti
+CXX.Flags += @GC_FLAGS@ @EXCEPTION_FLAGS@ -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -DENABLE_THREADS -fno-rtti
# GNU Classpath flags
CLASSPATH_FLAGS = @classpathinclude@
Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=134151&r1=134150&r2=134151&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Thu Jun 30 08:59:55 2011
@@ -5,9 +5,6 @@
N3_LIB = @N3_LIB@
MMTK_PLAN = @MMTK_PLAN@
MMTK_PLAN_HEADER = @MMTK_PLAN_HEADER@
-ISOLATE_BUILD = @ISOLATE_BUILD@
-SERVICE_BUILD = @SERVICE_BUILD@
-SINGLE_BUILD = @SINGLE_BUILD@
WITH_64 = @WITH_64@
ANT = @ANT@
Modified: vmkit/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/autoconf/configure.ac?rev=134151&r1=134150&r2=134151&view=diff
==============================================================================
--- vmkit/trunk/autoconf/configure.ac (original)
+++ vmkit/trunk/autoconf/configure.ac Thu Jun 30 08:59:55 2011
@@ -180,41 +180,6 @@
AC_SUBST([MMTK_PLAN])
dnl **************************************************************************
-dnl Virtual Machine type
-dnl **************************************************************************
-AC_ARG_WITH(vm-type,
- [AS_HELP_STRING(--with-vm-type=something,
- [VM type ('single' 'isolate' 'isolate-sharing' or 'service')])],
- [[vmtype=$withval]],
- [[ echo Using single as vm type.
- vmtype=single
- ]]
-)
-
-if test "x$vmtype" = "xisolate"; then
- VM_FLAGS="-DISOLATE"
- ISOLATE_BUILD=1
- SERVICE_BUILD=0
- SINGLE_BUILD=0
-else
- if test "x$vmtype" = "xservice"; then
- VM_FLAGS="-DISOLATE -DSERVICE"
- SERVICE_BUILD=1
- ISOLATE_BUILD=1
- SINGLE_BUILD=0
- else
- SINGLE_BUILD=1
- ISOLATE_BUILD=0
- SERVICE_BUILD=0
- fi
-fi
-
-AC_SUBST([SINGLE_BUILD])
-AC_SUBST([SERVICE_BUILD])
-AC_SUBST([ISOLATE_BUILD])
-AC_SUBST([VM_FLAGS])
-
-dnl **************************************************************************
dnl Exception type
dnl **************************************************************************
AC_ARG_WITH(exception-type,
Modified: vmkit/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/configure?rev=134151&r1=134150&r2=134151&view=diff
==============================================================================
--- vmkit/trunk/configure (original)
+++ vmkit/trunk/configure Thu Jun 30 08:59:55 2011
@@ -647,10 +647,6 @@
classpathlibs
classpathglibj
EXCEPTION_FLAGS
-VM_FLAGS
-ISOLATE_BUILD
-SERVICE_BUILD
-SINGLE_BUILD
MMTK_PLAN
GC_FLAGS
WITH_64
@@ -714,7 +710,6 @@
with_llvmsrc
with_llvmobj
with_mmtk_plan
-with_vm_type
with_exception_type
with_runtime_exception_type
with_gnu_classpath_libs
@@ -1355,9 +1350,6 @@
--with-llvmobj Location of LLVM Object Code
--with-mmtk-plan=something
MMTk plan type ('org.mmtk.plan.marksweep.MS')
- --with-vm-type=something
- VM type ('single' 'isolate' 'isolate-sharing' or
- 'service')
--with-exception-type=something
Exception type ('check' or 'dwarf')
--with-runtime-exception-type=something
@@ -2553,41 +2545,6 @@
-# Check whether --with-vm-type was given.
-if test "${with_vm_type+set}" = set; then :
- withval=$with_vm_type; vmtype=$withval
-else
- echo Using single as vm type.
- vmtype=single
-
-
-fi
-
-
-if test "x$vmtype" = "xisolate"; then
- VM_FLAGS="-DISOLATE"
- ISOLATE_BUILD=1
- SERVICE_BUILD=0
- SINGLE_BUILD=0
-else
- if test "x$vmtype" = "xservice"; then
- VM_FLAGS="-DISOLATE -DSERVICE"
- SERVICE_BUILD=1
- ISOLATE_BUILD=1
- SINGLE_BUILD=0
- else
- SINGLE_BUILD=1
- ISOLATE_BUILD=0
- SERVICE_BUILD=0
- fi
-fi
-
-
-
-
-
-
-
# Check whether --with-exception-type was given.
if test "${with_exception_type+set}" = set; then :
withval=$with_exception_type; exceptiontype=$withval
Modified: vmkit/trunk/lib/J3/LLVMRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/LLVMRuntime/Makefile?rev=134151&r1=134150&r2=134151&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/LLVMRuntime/Makefile (original)
+++ vmkit/trunk/lib/J3/LLVMRuntime/Makefile Thu Jun 30 08:59:55 2011
@@ -11,20 +11,8 @@
include $(LEVEL)/Makefile.config
VMKIT_RUNTIME = $(PROJ_SRC_DIR)/runtime-default.ll
-
VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-mmtk-thread.ll
-
-ifeq ($(ISOLATE_BUILD), 1)
-VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-isolate.ll
-endif
-
-ifeq ($(SERVICE_BUILD), 1)
-VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-service.ll $(PROJ_SRC_DIR)/runtime-isolate.ll
-endif
-
-ifeq ($(SINGLE_BUILD), 1)
VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-single.ll
-endif
BUILT_SOURCES = LLVMRuntime.inc
More information about the vmkit-commits
mailing list