[vmkit-commits] [vmkit] r180399 - remove the use of CXX.Flags
Peter Senna Tschudin
peter.senna at gmail.com
Thu Apr 25 10:08:03 PDT 2013
Author: peter.senna
Date: Thu Apr 25 12:06:00 2013
New Revision: 180399
URL: http://llvm.org/viewvc/llvm-project?rev=180399&view=rev
Log:
remove the use of CXX.Flags
(cherry picked from commit bff4638a90315394a80ce07c4295e24addaf6d69)
Modified:
vmkit/trunk/Makefile.common.in
vmkit/trunk/Makefile.rules
vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile
vmkit/trunk/lib/j3/Compiler/Makefile
vmkit/trunk/lib/j3/LLVMRuntime/Makefile
vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
vmkit/trunk/lib/j3/VMCore/JavaConstantPool.cpp
vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp
vmkit/trunk/lib/j3/VMCore/JavaObject.cpp
vmkit/trunk/lib/j3/VMCore/JavaTypes.cpp
vmkit/trunk/lib/j3/VMCore/Jni.cpp
vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/j3/VMCore/Makefile
vmkit/trunk/lib/vmkit/Compiler/Makefile
vmkit/trunk/tools/precompiler/Makefile
Modified: vmkit/trunk/Makefile.common.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.common.in?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/Makefile.common.in (original)
+++ vmkit/trunk/Makefile.common.in Thu Apr 25 12:06:00 2013
@@ -41,27 +41,27 @@ 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
Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:06:00 2013
@@ -122,13 +122,13 @@ endif
ifdef BUILD_FRAMETABLE
## have to remove this symbol (used elsewere)
-FRAMETABLES=FrametablesExterns.inc FrametablesSymbols.inc
+BUILT_INC+=$(patsubst %,$(BUILD_DIR)/%,FrametablesExterns.inc FrametablesSymbols.inc)
DEP_FRAMETABLES=$(patsubst %,$(LIB_DIR)/lib%.a,$(USE))
-FrametablesExterns.inc: $(DEP_FRAMETABLES) $(SELF)
+$(BUILD_DIR)/FrametablesExterns.inc: $(DEP_FRAMETABLES) $(SELF)
$(Verb) $(NM) $(DEP_FRAMETABLES) | grep __frametable | sed 's/\([a-f0-9]*\) \([a-zA-Z]*\) _*\([a-zA-Z0-9_]*\)/extern "C" CompiledFrames \3;/' > $@
-FrametablesSymbols.inc: $(DEP_FRAMETABLES) $(SELF)
+$(BUILD_DIR)/FrametablesSymbols.inc: $(DEP_FRAMETABLES) $(SELF)
$(Verb) $(NM) $(DEP_FRAMETABLES) | grep __frametable | sed 's/\([a-f0-9]*\) \([a-zA-Z]*\) _*\([a-zA-Z0-9_]*\)/\&\3,/' > $@
clean-local::
@@ -161,6 +161,20 @@ $(LIB_DIR)/$(LIBRARY)$(SHLIBEXT): $(MODU
$(Echo) "Linking shared library '$(notdir $@)'"
$(Verb) $(CLANGXX) -O0 -o $@ $(SHOPT) -shared -Wl,--whole-archive $(MODULE_A) -Wl,--no-whole-archive $(DEP_LIBS)
+###############################################################################
+# vmkit runtime generated files
+###############################################################################
+ifdef VMKIT_RUNTIME_OUT
+all:: $(BUILD_DIR)/$(VMKIT_RUNTIME_OUT)
+
+BUILT_INC+=$(BUILD_DIR)/$(VMKIT_RUNTIME_OUT)
+
+$(BUILD_DIR)/$(VMKIT_RUNTIME_OUT): $(VMKIT_RUNTIME_IN) $(SELF) $(BUILD_DIR)/.dir
+ $(Echo) "Generating vmkit meta file '$@'"
+ $(Verb) cat $(VMKIT_RUNTIME_IN) | $(LLVMAS) -o - | $(LLC) -march=cpp -cppgen=contents -o $@
+
+endif
+
#
#
# OLD BUILD SYSTEM
@@ -252,22 +266,13 @@ $(VMKIT_OPENJDK_ZIP): $(addprefix $(PROJ
endif
-
-
-
#
#
# NEW BUILD SYSTEM
#
#
#-I$(BUILD_DIR)
-INCLUDES+=-I. -I$(PROJ_SRC_ROOT)/include -I$(PROJ_SRC_ROOT)/lib/vmkit/MMTk \
- -I$(PROJ_SRC_ROOT)/include/j3 \
- -I$(PROJ_SRC_ROOT)/lib/j3/ClassLib/$(CLASSPATH_DIR) \
- -I$(PROJ_SRC_ROOT)/lib/j3/ClassLib/ \
- -I$(PROJ_SRC_ROOT)/lib/j3/Compiler/ \
- -I$(PROJ_SRC_ROOT)/lib/j3/VMCore/ \
- -I$(PROJ_SRC_ROOT)/lib/j3/LLVMRuntime/
+INCLUDES+=-I. -I$(PROJ_SRC_ROOT)/include -I$(PROJ_SRC_ROOT)/lib/vmkit/MMTk -I$(BUILD_DIR)
# should remove no-unused-variable
WARN_CFLAGS= -Wall -Wno-long-long -Wno-variadic-macros -Wno-unused-private-field -Wno-unused-variable
@@ -299,11 +304,11 @@ $(BUILD_DIR)/%-gc.bc: $(BUILD_DIR)/%.bc
$(Verb) $(LOPT) $< -load=$(PREPARE_CODE) -StaticGCPass -o $@
define define_compile_rule
-$(BUILD_DIR)/%.bc: %$1 $(SELF) $(FRAMETABLES) $(BUILD_DIR)/.dir
+$(BUILD_DIR)/%.bc: %$1 $(SELF) $(BUILT_INC) $(BUILD_DIR)/.dir
$(Echo) "Compiling '$(notdir $$<)'"
$(Verb) if $2 $3 $(DEPEND_OPTIONS) -emit-llvm -c "$$<" -o $$@; $(DOM)
-$(BUILD_DIR)/%.bc: $(BUILD_DIR)/%$1 $(FRAMETABLES) $(SELF) $(BUILD_DIR)/.dir
+$(BUILD_DIR)/%.bc: $(BUILD_DIR)/%$1 $(BUILT_INC) $(SELF) $(BUILD_DIR)/.dir
$(Echo) "Compiling '$(notdir $$<)'"
$(Verb) if $2 $3 $(DEPEND_OPTIONS) -emit-llvm -c "$$<" -o $$@; $(DOM)
endef
Modified: vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile (original)
+++ vmkit/trunk/lib/j3/ClassLib/GNUClasspath/Makefile Thu Apr 25 12:06:00 2013
@@ -8,18 +8,10 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../../..
-
-EXTRA_DIST = Classpath.inc ClasspathVMClass.inc ClasspathVMClassLoader.inc \
- ClasspathVMObject.inc ClasspathVMRuntime.inc \
- ClasspathVMStackWalker.inc ClasspathVMSystem.inc \
- ClasspathVMSystemProperties.inc ClasspathVMThread.inc \
- ClasspathVMThrowable.inc
-
include $(LEVEL)/Makefile.config
-MODULE_WITH_GC = Classpath
+MODULE_WITH_GC=Classpath
+INCLUDES+=-I../../VMCore -I..
include $(LEVEL)/Makefile.common
-CXX.Flags += -I$(PROJ_SRC_DIR)/../../VMCore -I$(PROJ_SRC_ROOT)/include/j3
-CXX.Flags += -I$(PROJ_SRC_DIR)/.. -I$(PROJ_OBJ_DIR)/..
Modified: vmkit/trunk/lib/j3/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/Makefile?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/Makefile (original)
+++ vmkit/trunk/lib/j3/Compiler/Makefile Thu Apr 25 12:06:00 2013
@@ -8,12 +8,9 @@
##===----------------------------------------------------------------------===##
LEVEL = ../../..
-EXTRA_DIST = JavaJITClasspath.inc JavaJITOpenJDK.inc
-
include $(LEVEL)/Makefile.config
MODULE_WITH_GC = J3Compiler
+INCLUDES+=-I../ClassLib/$(CLASSPATH_DIR) -I../ClassLib/ -I../VMCore -I../LLVMRuntime/$(BUILD_DIR)
include $(LEVEL)/Makefile.common
-
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../ClassLib/$(CLASSPATH_DIR) -I$(PROJ_SRC_DIR)/../ClassLib/ -I$(PROJ_SRC_DIR)/../VMCore
Modified: vmkit/trunk/lib/j3/LLVMRuntime/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/LLVMRuntime/Makefile?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/LLVMRuntime/Makefile (original)
+++ vmkit/trunk/lib/j3/LLVMRuntime/Makefile Thu Apr 25 12:06:00 2013
@@ -10,10 +10,10 @@ LEVEL = ../../..
include $(LEVEL)/Makefile.config
-VMKIT_RUNTIME = $(PROJ_SRC_DIR)/runtime-default.ll
-VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-mmtk-thread.ll
-VMKIT_RUNTIME += $(PROJ_SRC_DIR)/runtime-single.ll
+VMKIT_RUNTIME_IN=$(PROJ_SRC_DIR)/runtime-default.ll
+VMKIT_RUNTIME_IN+=$(PROJ_SRC_DIR)/runtime-mmtk-thread.ll
+VMKIT_RUNTIME_IN+=$(PROJ_SRC_DIR)/runtime-single.ll
-BUILT_SOURCES = LLVMRuntime.inc
+VMKIT_RUNTIME_OUT=LLVMRuntime.inc
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.cpp Thu Apr 25 12:06:00 2013
@@ -17,7 +17,7 @@
#include "ClasspathReflect.h"
#include "JavaArray.h"
#include "JavaClass.h"
-#include "JavaCompiler.h"
+#include "j3/JavaCompiler.h"
#include "JavaString.h"
#include "JavaConstantPool.h"
#include "JavaObject.h"
Modified: vmkit/trunk/lib/j3/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaConstantPool.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaConstantPool.cpp Thu Apr 25 12:06:00 2013
@@ -17,7 +17,7 @@
#include "JavaAccess.h"
#include "JavaArray.h"
#include "JavaClass.h"
-#include "JavaCompiler.h"
+#include "j3/JavaCompiler.h"
#include "JavaConstantPool.h"
#include "Jnjvm.h"
#include "JavaThread.h"
Modified: vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaMetaJIT.cpp Thu Apr 25 12:06:00 2013
@@ -9,7 +9,7 @@
#include <cstdarg>
#include <cstring>
-#include <jni.h>
+#include "j3/jni.h"
#include "debug.h"
Modified: vmkit/trunk/lib/j3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaObject.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaObject.cpp Thu Apr 25 12:06:00 2013
@@ -20,7 +20,7 @@
#include "Jnjvm.h"
#include "VMStaticInstance.h"
-#include <jni.h>
+#include "j3/jni.h"
#include "debug.h"
using namespace j3;
Modified: vmkit/trunk/lib/j3/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaTypes.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaTypes.cpp Thu Apr 25 12:06:00 2013
@@ -11,7 +11,7 @@
#include "JavaArray.h"
#include "JavaClass.h"
-#include "JavaCompiler.h"
+#include "j3/JavaCompiler.h"
#include "JavaTypes.h"
using namespace j3;
Modified: vmkit/trunk/lib/j3/VMCore/Jni.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jni.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jni.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jni.cpp Thu Apr 25 12:06:00 2013
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include <jni.h>
+#include "j3/jni.h"
#include "vmkit/System.h"
Modified: vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/Jnjvm.cpp Thu Apr 25 12:06:00 2013
@@ -24,7 +24,7 @@
#include "ClasspathReflect.h"
#include "JavaArray.h"
#include "JavaClass.h"
-#include "JavaCompiler.h"
+#include "j3/JavaCompiler.h"
#include "JavaConstantPool.h"
#include "JavaString.h"
#include "JavaThread.h"
Modified: vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JnjvmClassLoader.cpp Thu Apr 25 12:06:00 2013
@@ -32,7 +32,7 @@
#include "Classpath.h"
#include "ClasspathReflect.h"
#include "JavaClass.h"
-#include "JavaCompiler.h"
+#include "j3/JavaCompiler.h"
#include "JavaConstantPool.h"
#include "JavaString.h"
#include "JavaThread.h"
Modified: vmkit/trunk/lib/j3/VMCore/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Makefile?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/Makefile (original)
+++ vmkit/trunk/lib/j3/VMCore/Makefile Thu Apr 25 12:06:00 2013
@@ -13,7 +13,7 @@ EXTRA_DIST = JniClasspath.inc JniOpenJDK
include $(LEVEL)/Makefile.config
MODULE_WITH_GC = J3
+INCLUDES+=-I../ClassLib -I../ClassLib/$(CLASSPATH_DIR)
include $(LEVEL)/Makefile.common
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../ClassLib -I$(PROJ_OBJ_DIR)/../LLVMRuntime -I$(PROJ_SRC_DIR)/../ClassLib/$(CLASSPATH_DIR) -I$(PROJ_SRC_DIR)/../../../include/j3 -I$(PROJ_SRC_DIR)/../ClassLib
Modified: vmkit/trunk/lib/vmkit/Compiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/Makefile?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/Makefile (original)
+++ vmkit/trunk/lib/vmkit/Compiler/Makefile Thu Apr 25 12:06:00 2013
@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.config
MODULE_WITH_GC = VmkitCompiler
-VMKIT_RUNTIME = $(PROJ_SRC_DIR)/LLVMRuntime.ll
-BUILT_SOURCES = LLVMRuntime.inc
+VMKIT_RUNTIME_IN=$(PROJ_SRC_DIR)/LLVMRuntime.ll
+VMKIT_RUNTIME_OUT=LLVMRuntime.inc
include $(LEVEL)/Makefile.common
Modified: vmkit/trunk/tools/precompiler/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/Makefile?rev=180399&r1=180398&r2=180399&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Makefile (original)
+++ vmkit/trunk/tools/precompiler/Makefile Thu Apr 25 12:06:00 2013
@@ -12,7 +12,7 @@ include $(LEVEL)/Makefile.config
TOOL=precompiler
USE=Classpath J3 J3Compiler Vmkit VmkitCompiler CommonThread FinalMMTk
-BUILD_FRAMETABLE = 1
-LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo asmparser linker bitwriter
+BUILD_FRAMETABLE=1
+LINK_COMPONENTS=jit nativecodegen scalaropts instrumentation ipa ipo asmparser linker bitwriter
include $(LEVEL)/Makefile.common
More information about the vmkit-commits
mailing list