Merging r257940:

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 5c908c043e8125c7e87d2c88fb11066c73fa0be4..b2e53006bf08dba1163dd6d08a1a757d9993062c 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -34,27 +34,11 @@ endif
 .PRECIOUS: Output/%.llvm.bc
 .PRECIOUS: Output/%.llvm
 
-# Find the location of the platform specific LLVM GCC libraries
-LLVMGCCLIBDIR=$(dir $(shell $(LLVMGCC) -print-file-name=libgcc.a))
-
-# LLVM Tool Definitions (LLVMGCC, LLVMGXX, LLVMAS are provided by Makefile.rules)
-LLI      = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
-LLC      = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
-LGCCAS   = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
-LGCCLD   = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
-LDIS     = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
-LOPT     = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
-LLINK    = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
-LPROF    = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
-LANALYZE = $(LLVMTOOLCURRENT)/analyze$(EXEEXT)
-LBUGPOINT= $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
-
 LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
-FAILURE  = $(LLVM_SRC_ROOT)/test/Failure.sh
 TESTRUNR = @echo Running test: $<; \
-             PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \
+             PATH="$(LLVMTOOLCURRENT):$(PATH)" \
                   $(LLVM_SRC_ROOT)/test/TestRunner.sh
 
 LLCLIBS := $(LLCLIBS) -lm
@@ -63,18 +47,6 @@ clean::
        $(RM) -f a.out core
        $(RM) -rf Output/
 
-# Compile from X.c to Output/X.ll
-Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-       -$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
-
-# Compile from X.cpp to Output/X.ll
-Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-       -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@
-
-# Compile from X.cc to Output/X.ll
-Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-       -$(LLVMGXX) $(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.
 #
@@ -85,7 +57,7 @@ Output/%.bc: Output/%.ll $(LGCCAS)
 # LLVM source, use the non-transforming assembler.
 #
 Output/%.bc: %.ll $(LLVMAS) Output/.dir
-       -$(LLVMAS) -f $< -o $@
+       -$(LLVMAS) $< -o $@
 
 ## Cancel built-in implicit rules that override above rules
 %: %.s