Add fixmes

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index fc93463c746ae5e8f945181812eaaf79f9b3edd3..b9040bc5dc6524b542a6ee8060d974b765b50739 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -30,11 +30,7 @@ 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
+TOOLS    = $(LLVMTOOLCURRENT)
 
 # LLVM Tool Definitions...
 #
@@ -47,6 +43,7 @@ LLC      = $(TOOLS)/llc
 LAS      = $(TOOLS)/as
 LGCCAS   = $(TOOLS)/gccas
 LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
+LGCCLDPROG = $(TOOLS)/gccld
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
@@ -57,26 +54,36 @@ LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
 FAILURE  = $(LEVEL)/test/Failure.sh
-TESTRUNR = $(LEVEL)/test/TestRunner.sh
+TESTRUNR = @echo Running test: $<; \
+             PATH=$(LLVMTOOLCURRENT):$(LEVEL)/test/Scripts:$(PATH) \
+                  $(LEVEL)/test/TestRunner.sh
 
 # Native Tool Definitions
-NATGCC  = /usr/dcs/software/supported/bin/gcc
+NATGCC  = $(CC)
 CP     = /bin/cp -f
 
+## If TRACE or TRACEM is "yes", set the appropriate llc flag (-trace or -tracem)
+## mark that tracing on, and set the TRACELIBS variable.
+TRACEFLAGS = 
+DOTRACING  =
 ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace basicblock
-    LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
+    TRACEFLAGS += -trace
+    DOTRACING = yes
 else
     ifeq ($(TRACEM), yes)
-       LLCFLAGS += -trace function
-       LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
+       TRACEFLAGS += -tracem
+       DOTRACING = yes
     endif
 endif
+ifdef DOTRACING
+    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
+endif
+
 
 LLCLIBS := $(LLCLIBS) -lm
 
 clean::
-       $(RM) a.out core
+       $(RM) -f a.out core
        $(RM) -rf Output/
 
 # Compile from X.c to Output/X.ll
@@ -87,6 +94,10 @@ Output/%.ll: $(SourceDir)%.c $(LCC1) Output/.dir $(INCLUDES)
 Output/%.ll: $(SourceDir)%.cpp $(LCC1XX) Output/.dir $(INCLUDES)
        $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
 
+# Compile from X.cc to Output/X.ll
+Output/%.ll: $(SourceDir)%.cc $(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.
 #