[vmkit-commits] [vmkit] r180372 - use my rule for cpp to ll or o

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:02:37 2013
New Revision: 180372

URL: http://llvm.org/viewvc/llvm-project?rev=180372&view=rev
Log:
use my rule for cpp to ll or o
(cherry picked from commit c58651a87d3e4476c714ded8422fc533170db08e)

Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180372&r1=180371&r2=180372&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:02:37 2013
@@ -41,7 +41,7 @@ glibj.zip.bc :
 	else \
 	  $(VMJC) -f -std-compile-opts $(GLIBJ) -o glibj.zip.bc; \
 	fi
-	
+
 glibj-optimized.zip.bc : glibj.zip.bc
 	$(Echo) "Optimizing glibj.zip"
 	$(Verb) $(LOPT) -std-compile-opts -f glibj.zip.bc -o glibj-optimized.zip.bc
@@ -147,7 +147,7 @@ all-local:: FrametablesExterns.inc Frame
 
 clean-local::
 	-$(Verb) $(RM) -f FrametablesExterns.inc FrametablesSymbols.inc
-	
+
 endif
 
 ###############################################################################
@@ -172,3 +172,38 @@ $(VMKIT_OPENJDK_ZIP): $(addprefix $(PROJ
 	cd $(CLASSES_DIR) && $(ZIP) -qr $(VMKIT_OPENJDK_ZIP) .
 
 endif
+
+# NEW BUILD SYSTEM
+#                                                                                                                                          
+# global variables                                                                                                                         
+#                                                                                                                                          
+
+LLVM_CONFIG=/home/gael/vmkit/llvm/Release+Asserts/bin/llvm-config
+
+LLVM_BIN=`$(LLVM_CONFIG) --bindir`
+
+CLANGXX=$(LLVM_BIN)/clang++
+
+#-I$(BUILDDIR) 
+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/
+
+# should remove no-unused-variable                                                                                                         
+WARN_CFLAGS=  -Wall -Wno-long-long -Wno-variadic-macros -Wno-unused-private-field -Wno-unused-variable
+COMMON_CFLAGS+=  -O0 $(INCLUDES) -fno-strict-aliasing -fno-omit-frame-pointer  -ansi -pedantic $(WARN_CFLAGS)
+
+CXXFLAGS+=$(COMMON_CFLAGS) `$(LLVM_CONFIG) --cxxflags`
+
+$(ObjDir)/%.ll: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(LLVMCXX)
+	$(Echo) "** Compiling $*.cpp for $(BuildMode) build (bytecode)"
+	$(Verb) $(CLANGXX) -S $(CXXFLAGS) -emit-llvm -c "$<" -o $@
+
+$(ObjDir)/%.o: %.cpp $(ObjDir)/.dir $(BUILT_SOURCES) $(PROJ_MAKEFILE)
+	$(Echo) "** Compiling $*.cpp for $(BuildMode) build" $(PIC_FLAG)
+	$(Verb) $(CLANGXX) $(CXXFLAGS) -c "$<" -o $@
+