New testcase

[oota-llvm.git] / test / Makefile.tests

diff --git a/test/Makefile.tests b/test/Makefile.tests
index d523bc9ad3cee55d993df120f25d05510705b681..fc93463c746ae5e8f945181812eaaf79f9b3edd3 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -38,20 +38,15 @@ endif
 
 # LLVM Tool Definitions...
 #
-ifdef LLVMGCCARCH # FIXME: Remove when new CFE is used on sparc as well!
 LCC      = $(LLVMGCCDIR)/bin/gcc
 LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
-else
-LCC      = $(LLVMGCCDIR)/bin/llvm-gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/llvm/3.1/cc1
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/llvm/lib
-endif
-
+LCXX     = $(LLVMGCCDIR)/bin/g++
+LCC1XX   = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
 LAS      = $(TOOLS)/as
 LGCCAS   = $(TOOLS)/gccas
+LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
@@ -59,6 +54,7 @@ LANALYZE = $(TOOLS)/analyze
 LBUGPOINT= $(TOOLS)/bugpoint
 
 LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
 FAILURE  = $(LEVEL)/test/Failure.sh
 TESTRUNR = $(LEVEL)/test/TestRunner.sh
@@ -84,8 +80,12 @@ clean::
        $(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll
-Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-       $(LCC) $(LCCFLAGS) -S $< -o $@
+Output/%.ll: $(SourceDir)%.c $(LCC1) Output/.dir $(INCLUDES)
+       $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
+
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: $(SourceDir)%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
 # LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
 # from GCC output, so use GCCAS.
@@ -104,7 +104,12 @@ Output/%.bc: %.ll $(LAS) Output/.dir
 #
 Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
        @echo "======== Compiling $<"
-       $(LCC) $(LCCFLAGS) -S $< -o $@ || \
+       $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \
+           ( rm -f $@; $(FAILURE) $@ )
+
+Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+       @echo "======== Compiling $<"
+       $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \
            ( rm -f $@; $(FAILURE) $@ )
 
 Output/%.tbc: Output/%.tll $(LAS)