Point to the RIGHT GCC library directory

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index fab085f4c98d5c9d3fa03e9d16875be5bbfd25f2..682ba0e9f610d696a0a83788e8e7740d1bbe0819 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -1,6 +1,8 @@
 ##----------------------------------------------------------*- Makefile -*-===##
+##
 ## Common rules for generating, linking, and compiling via LLVM.  This is
 ## used to implement a robust testing framework for LLVM
+##
 ##-------------------------------------------------------------------------===##
 
 # If the user specified a TEST= option on the command line, we do not want to do
@@ -34,15 +36,14 @@ TOOLS    = $(LLVMTOOLCURRENT)
 
 # LLVM Tool Definitions...
 #
-LCC      = $(LLVMGCCDIR)/bin/gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
-LCXX     = $(LLVMGCCDIR)/bin/g++
-LCC1XX   = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
+LCC      = $(LLVMGCC)   ## FIXME: remove these definitions, use LLVMGCC directly
+LCXX     = $(LLVMGXX)   ## FIXME: remove these definitions, use LLVMGXX directly
+LAS      = $(LLVMAS)    ## FIXME: remove these definitions, use LLVMAS directly
+
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
 LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
+LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
 LGCCLDPROG = $(TOOLS)/gccld
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
@@ -54,8 +55,9 @@ LCCFLAGS  += -O2 -Wall
 LCXXFLAGS += -O2 -Wall
 LLCFLAGS =
 FAILURE  = $(LEVEL)/test/Failure.sh
-TESTRUNR = PATH=$(LLVMTOOLCURRENT):$(LEVEL)/test/Scripts:$(PATH) \
-               $(LEVEL)/test/TestRunner.sh
+TESTRUNR = @echo Running test: $<; \
+             PATH=$(LLVMTOOLCURRENT):$(LEVEL)/test/Scripts:$(PATH) \
+                  $(LEVEL)/test/TestRunner.sh
 
 # Native Tool Definitions
 NATGCC  = $(CC)
@@ -65,23 +67,19 @@ CP  = /bin/cp -f
 ## mark that tracing on, and set the TRACELIBS variable.
 TRACEFLAGS = 
 ifeq ($(TRACE), yes)
-    TRACEFLAGS += -trace
-    DOTRACING = yes
-else
-    ifeq ($(TRACEM), yes)
-       TRACEFLAGS += -tracem
-       DOTRACING = yes
-    endif
-endif
-ifeq ($(DOTRACING), yes)
-    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
+    TRACEFLAGS = -trace
+    TRACELIBS := -L$(LEVEL)/test/Libraries/Output -linstr.$(ARCH)
 endif
 
+ifeq ($(TRACEM), yes)
+    TRACEFLAGS = -tracem
+    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