[vmkit-commits] [vmkit] r180333 - Remove my wrong sentence from README.txt. Check the optimization flags after having included the llvm build system.

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 11:58:40 2013
New Revision: 180333

URL: http://llvm.org/viewvc/llvm-project?rev=180333&view=rev
Log:
Remove my wrong sentence from README.txt. Check the optimization flags after having included the llvm build system.
(cherry picked from commit bcdce8922b67da539c7c1058569e6b30becf9f5e)

Modified:
    vmkit/trunk/Makefile.common.in
    vmkit/trunk/README.TXT

Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=180333&r1=180332&r2=180333&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Apr 25 11:58:40 2013
@@ -16,48 +16,9 @@ ifeq ($(BUILD_FRAMETABLE), 1)
   BUILT_SOURCES = FrametablesSymbols.inc FrametablesExterns.inc
 endif
 
-#ENABLE_OPTIMIZED	:= 0
 REQUIRES_FRAME_POINTER	:= 1
 JAVAC_TARGET		:= 1.5
 
-ifneq ($(ENABLE_OPTIMIZED), 1)
-	CFLAGS			+= -O0
-	CXXFLAGS		+= -O0
-
-	LLC_CPP_FLAGS		:= -O=0
-	LLC_ASM_FLAGS		:= -O=0 -asm-verbose
-	LLC_GLIBJ_FLAGS		:=
-	
-	OPT_BC_WITH_GC_FLAGS	:= -inline
-	OPT_MMTK_FLAGS		:=
-	OPT_VMJC_FLAGS		:= -std-compile-opts
-	
-	VMJC_MMTK_FLAGS		:=
-	VMJC_GLIBJ_FLAGS	:= -jit-emit-debug -std-compile-opts
-	
-	PRECOMPILER_FLAGS	:=
-	
-	KEEP_SYMBOLS		:= 1
-	DEBUG_RUNTIME		:= 1
-	DEBUG_SYMBOLS		:= 1
-else
-	CFLAGS			+= -O2 -g0
-	CXXFLAGS		+= -O2 -g0
-	
-	LLC_CPP_FLAGS		:=
-	LLC_ASM_FLAGS		:= -O=2 -disable-debug-info-print
-	LLC_GLIBJ_FLAGS		:= -disable-debug-info-print
-	
-	OPT_BC_WITH_GC_FLAGS	:= -std-compile-opts -strip-debug
-	OPT_MMTK_FLAGS		:= -std-compile-opts -strip-debug
-	OPT_VMJC_FLAGS		:= -std-compile-opts -strip-debug
-	
-	PRECOMPILER_FLAGS	:= -O3
-	
-	VMJC_MMTK_FLAGS		:= -std-compile-opts
-	VMJC_GLIBJ_FLAGS	:= -std-compile-opts
-endif
-
 # Include LLVM's Master Makefile.
 include $(LLVM_OBJ_ROOT)/Makefile.common
 
@@ -75,4 +36,33 @@ endif
 
 LIBS += -lz
 
+
+ifeq ($(ENABLE_OPTIMIZED),1)
+	LLC_CPP_FLAGS		:=
+	LLC_ASM_FLAGS		:= -O=2 -disable-debug-info-print
+	LLC_GLIBJ_FLAGS		:= -disable-debug-info-print
+	
+	OPT_BC_WITH_GC_FLAGS	:= -std-compile-opts -strip-debug
+	OPT_MMTK_FLAGS		:= -std-compile-opts -strip-debug
+	OPT_VMJC_FLAGS		:= -std-compile-opts -strip-debug
+	
+	PRECOMPILER_FLAGS	:= -O3
+	
+	VMJC_MMTK_FLAGS		:= -std-compile-opts
+	VMJC_GLIBJ_FLAGS	:= -std-compile-opts
+else
+	LLC_CPP_FLAGS		:= -O=0
+	LLC_ASM_FLAGS		:= -O=0 -asm-verbose
+	LLC_GLIBJ_FLAGS		:=
+	
+	OPT_BC_WITH_GC_FLAGS	:= -inline
+	OPT_MMTK_FLAGS		:=
+	OPT_VMJC_FLAGS		:= -std-compile-opts
+	
+	VMJC_MMTK_FLAGS		:=
+	VMJC_GLIBJ_FLAGS	:= -jit-emit-debug -std-compile-opts
+	
+	PRECOMPILER_FLAGS	:=
+endif
+
 include $(VMKIT_SRC_ROOT)/Makefile.rules

Modified: vmkit/trunk/README.TXT
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/README.TXT?rev=180333&r1=180332&r2=180333&view=diff
==============================================================================
--- vmkit/trunk/README.TXT (original)
+++ vmkit/trunk/README.TXT Thu Apr 25 11:58:40 2013
@@ -53,8 +53,6 @@ ln -sf ../native/jni/java-util/.libs/lib
 LLVM:
 =====
 
-* Notice that installing clang is not mandatory on a recent MACOS
-
 * Get it (git):
 
 git clone http://llvm.org/git/llvm.git