Remove unneccesary path from link line now

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

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 21c4b7cb4335f6b52630e6e2f97834824d616433..5d854f98b4b6498acd3ae55e6fae0537f16ee6e9 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -15,15 +15,19 @@ include ${LEVEL}/Makefile.common
 .PRECIOUS: Output/%.bc  Output/%.ll
 .PRECIOUS: Output/%.tbc Output/%.tll
 .PRECIOUS: Output/.dir
+.PRECIOUS: Output/%.llvm.bc
+.PRECIOUS: Output/%.llvm
 
 # LLVM Tool Definitions...
 #
 LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
+LCC1     = /home/vadve/lattner/cvs/gcc_install/lib/gcc-lib/llvm/3.1/cc1
 TOOLS    = $(LEVEL)/tools/Debug
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
 LAS      = $(TOOLS)/as
 LGCCAS   = $(TOOLS)/gccas
+LGCCLD   = $(TOOLS)/gccld -L/home/vadve/lattner/cvs/gcc_install/lib/gcc-lib/llvm/3.1/
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
@@ -31,6 +35,7 @@ LLINK    = $(TOOLS)/link
 LCCFLAGS  += -O2 -Wall
 LLCFLAGS =
 FAILURE  = $(LEVEL)/test/Failure.sh
+TESTRUNR = $(LEVEL)/test/TestRunner.sh
 
 # Native Tool Definitions
 NATGCC  = /usr/dcs/software/supported/bin/gcc
@@ -40,35 +45,53 @@ DIS     = /usr/ccs/bin/dis
 CP     = /bin/cp -f
 CFLAGS  += -g -xarch=v9
 
-LLCLIB   = $(LEVEL)/test/runtime.o
-LIBS    += $(LLCLIB)
-
-
 
 ifeq ($(TRACE), yes)
-    LLCFLAGS += -trace
-endif
-ifeq ($(TRACEM), yes)
-    LLCFLAGS += -tracem
+    LLCFLAGS += -trace basicblock
+    LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
+else
+    ifeq ($(TRACEM), yes)
+        LLCFLAGS += -trace function
+       LLCLIBS := -L$(LEVEL)/test/Libraries/Output -linstr64
+    endif
 endif
 
+LLCLIBS := $(LLCLIBS) -lm
+
 clean ::
        $(RM) a.out core
        $(RM) -rf Output/
 
-Output/%.ll: %.c $(LCC) Output/.dir
+# Compile from X.c to Output/X.ll
+Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
        $(LCC) $(LCCFLAGS) -S $< -o $@
 
+# LLVM Assemble from Output/X.ll to Output/X.bc.  Output/X.ll must have come
+# from GCC output, so use GCCAS.
+#
 Output/%.bc: Output/%.ll $(LGCCAS)
        $(LGCCAS) $< -o $@
 
-Output/%.bc: %.ll $(LAS)
-       $(LAS) $< -o $@
+# LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
+# LLVM source, use the non-transforming assembler.
+#
+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...
 #
-Output/%.tll: %.c $(LCC) Output/.dir
+Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES)
        @echo "======== Compiling $<"
        $(LCC) $(LCCFLAGS) -S $< -o $@ || \
            ( rm -f $@; $(FAILURE) $@ )
@@ -79,14 +102,6 @@ Output/%.tbc: Output/%.tll $(LAS)
             ( rm -f $@; $(FAILURE) $@ )
 
 
-
-#%.s: %.linked.bc
-#      $(LLC) -f $(LLCFLAGS) $< -o $@
-
-#%: %.o $(LIBS)
-#      $(CC) $(LDFLAGS) $< $(LIBS) -o $@
-
-
 ## Cancel built-in implicit rules that override above rules
 %: %.s
 
@@ -94,11 +109,3 @@ Output/%.tbc: Output/%.tll $(LAS)
 
 %.o: %.c
 
-## The next two rules are for disassembling an executable or an object file
-#%.dis: %
-#      $(DIS) $< > $@
-
-#%.dis: %.o
-#      $(DIS) $< > $@
-
-