[llvm-commits] [test-suite] r118685 - in /test-suite/trunk: Makefile.rules Makefile.tests

[Tobias Grosser]

Author: grosser
Date: Wed Nov 10 11:00:55 2010
New Revision: 118685

URL: http://llvm.org/viewvc/llvm-project?rev=118685&view=rev
Log:
Add dragonegg support to the test suite.

Use LLVMCC_EMITIR_FLAG and LLVMGCC_DISABLE_OPT_FLAGS to derive the flags
needed to build using either the classic llvm-gcc or the dragonegg based
llvm-gcc.


Modified:
    test-suite/trunk/Makefile.rules
    test-suite/trunk/Makefile.tests

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=118685&r1=118684&r2=118685&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Wed Nov 10 11:00:55 2010
@@ -368,7 +368,7 @@
 ifdef DISABLE_LTO
 LOPTFLAGS := $(OPTFLAGS)
 else
-LOPTFLAGS := $(OPTFLAGS) -mllvm -disable-llvm-optzns
+LOPTFLAGS := $(OPTFLAGS) $(LLVMGCC_DISABLEOPT_FLAGS)
 endif
 
 # Explicitly specify -m32 / -m64 so there is no mismatch between llvm-gcc

Modified: test-suite/trunk/Makefile.tests
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.tests?rev=118685&r1=118684&r2=118685&view=diff
==============================================================================
--- test-suite/trunk/Makefile.tests (original)
+++ test-suite/trunk/Makefile.tests Wed Nov 10 11:00:55 2010
@@ -42,29 +42,33 @@
 	$(RM) -f a.out core
 	$(RM) -rf Output/
 
-# Compile from X.c to Output/X.bc
-Output/%.bc: %.c $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@ -emit-llvm
-
-# Compile from X.cpp to Output/X.bc
-Output/%.bc: %.cpp $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@ -emit-llvm
-
-# Compile from X.cc to Output/X.bc
-Output/%.bc: %.cc $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@ -emit-llvm
-
-# Compile from X.C to Output/X.bc
-Output/%.bc: %.C $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@ -emit-llvm
-
-# Compile from X.m to Output/X.bc
-Output/%.bc: %.m $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@ -emit-llvm
-
-# Compile from X.mm to Output/X.bc
-Output/%.bc: %.mm $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@ -emit-llvm
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
+	-$(LCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG)
+
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: %.cpp $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG)
+
+# Compile from X.cc to Output/X.ll
+Output/%.ll: %.cc $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG)
+
+# Compile from X.C to Output/X.ll
+Output/%.ll: %.C $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG)
+
+# Compile from X.m to Output/X.ll
+Output/%.ll: %.m $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
+	-$(LCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG)
+
+# Compile from X.mm to Output/X.ll
+Output/%.ll: %.mm $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(X_TARGET_FLAGS) -S $< -o $@ $(LLVMCC_EMITIR_FLAG)
+
+# Compile from X.ll to X.bc
+%.bc: %.ll $(LLVMAS)
+	$(LLVMAS) $< -o $@
 
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.