New test for appending linkage

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 1b9a413595650f374e52dd9035b301e129d93074..61312795350312fd9ab9ebd3f2992f8592db3ee5 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,16 +1,22 @@
-##-----------------------------------------------------------*-Makefile-*-
+##----------------------------------------------------------*- Makefile -*-===##
 ## Common rules for generating, linking, and compiling via LLVM.  This is
 ## used to implement a robust testing framework for LLVM
-##------------------------------------------------------------------------
+##-------------------------------------------------------------------------===##
 
-## NOTE: This is preliminary and will change in the future
+# If the user specified a TEST= option on the command line, we do not want to do
+# the default testing type.  Instead, we change the default target to be the
+# test:: target.
+#
+ifdef TEST
+test::
+endif
 
 include ${LEVEL}/Makefile.common
 
-# Specify ENABLE_STATS on the command line to enable -stats output from gccas
-# and gccld.
+# Specify ENABLE_STATS on the command line to enable -stats and -time-passes
+# output from gccas and gccld.
 ifdef ENABLE_STATS
-STATS = -stats
+STATS = -stats -time-passes
 endif
 
 
@@ -24,22 +30,31 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
+ifdef ENABLE_OPTIMIZED
+TOOLS    = $(BUILD_ROOT_TOP)/tools/Release
+else
+TOOLS    = $(BUILD_ROOT_TOP)/tools/Debug
+endif
+
 # LLVM Tool Definitions...
 #
-LCC      = $(LLVMGCCDIR)/bin/llvm-gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/llvm/3.1/cc1
-TOOLS    = $(BUILD_ROOT_TOP)/tools/Debug
+LCC      = $(LLVMGCCDIR)/bin/gcc
+LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
+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)/llvm/lib
+LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
 LANALYZE = $(TOOLS)/analyze
+LBUGPOINT= $(TOOLS)/bugpoint
 
 LCCFLAGS  += -O2 -Wall
+LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
 FAILURE  = $(LEVEL)/test/Failure.sh
 TESTRUNR = $(LEVEL)/test/TestRunner.sh
@@ -48,20 +63,12 @@ TESTRUNR = $(LEVEL)/test/TestRunner.sh
 NATGCC  = /usr/dcs/software/supported/bin/gcc
 CP     = /bin/cp -f
 
-ifndef DISABLE_LLC_DIFFS
-CC      = /opt/SUNWspro/bin/cc
-AS     = /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CFLAGS  += -g -xarch=v9
-endif
-
-
 ifeq ($(TRACE), yes)
     LLCFLAGS += -trace basicblock
     LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
 else
     ifeq ($(TRACEM), yes)
-        LLCFLAGS += -trace function
+       LLCFLAGS += -trace function
        LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
     endif
 endif
@@ -76,6 +83,10 @@ clean::
 Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
        $(LCC) $(LCCFLAGS) -S $< -o $@
 
+# Compile from X.cpp to Output/X.ll
+Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+       $(LCXX) $(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.
 #
@@ -88,16 +99,6 @@ Output/%.bc: Output/%.ll $(LGCCAS)
 Output/%.bc: %.ll $(LAS) Output/.dir
        $(LAS) -f $< -o $@
 
-# Compile a linked program to machine code for this processor.
-#
-Output/%.llc.s: Output/%.llvm.bc
-       $(LLC) $(LLCFLAGS) -f $< -o $@
-
-# Assemble (and link) an LLVM-linked program using the system assembler...
-#
-Output/%.llc: Output/%.llc.s
-       $(CC) $(CFLAGS) $< $(LLCLIBS) -o $@
-
 #
 # Testing versions of provided utilities...
 #
@@ -106,6 +107,11 @@ Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
        $(LCC) $(LCCFLAGS) -S $< -o $@ || \
            ( rm -f $@; $(FAILURE) $@ )
 
+Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
+       @echo "======== Compiling $<"
+       $(LCXX) $(LCXXFLAGS) -S $< -o $@ || \
+           ( rm -f $@; $(FAILURE) $@ )
+
 Output/%.tbc: Output/%.tll $(LAS)
        @echo "======== Assembling $<"
        $(LAS) -f $< -o $@ || \