More rules checked in

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1571 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index 2b7bf2c647dc77fa2a0e8f25f63ad189b305988d..9166324359ae4730c249548f8945a9680fdc40e7 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,3 +1,4 @@
 LEVEL  = ..
-DIRS   = Feature Regression Programs
-include ../Makefile.common
\ No newline at end of file
+DIRS   = Feature Libraries Regression Programs
+include ../Makefile.common
+

diff --git a/test/Makefile.tests b/test/Makefile.tests
index 3390d01b118ba5c06623ea1099c66eb71d858b8c..21c4b7cb4335f6b52630e6e2f97834824d616433 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -10,26 +10,41 @@ include ${LEVEL}/Makefile.common
 
 .PHONY: clean default
 
-## keep %.bc and %.s from being deleted while we're debugging
-.PRECIOUS: Output/%.bc Output/%.ll %.s Output/.dir
-
-
+# These files, which might be intermediate results, should not be deleted by
+# make
+.PRECIOUS: Output/%.bc  Output/%.ll
+.PRECIOUS: Output/%.tbc Output/%.tll
+.PRECIOUS: Output/.dir
+
+# LLVM Tool Definitions...
+#
+LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
 TOOLS    = $(LEVEL)/tools/Debug
-
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/gccas
+LAS      = $(TOOLS)/as
+LGCCAS   = $(TOOLS)/gccas
 LDIS     = $(TOOLS)/dis 
 LOPT     = $(TOOLS)/opt
 LLINK    = $(TOOLS)/link
+
+LCCFLAGS  += -O2 -Wall
 LLCFLAGS =
+FAILURE  = $(LEVEL)/test/Failure.sh
 
-LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  += -O2 -Wall
+# Native Tool Definitions
+NATGCC  = /usr/dcs/software/supported/bin/gcc
+CC      = /opt/SUNWspro/bin/cc
+AS     = /opt/SUNWspro/bin/cc
+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
@@ -37,43 +52,36 @@ ifeq ($(TRACEM), yes)
     LLCFLAGS += -tracem
 endif
 
-NATGCC  = /usr/dcs/software/supported/bin/gcc
-
-CC      = /opt/SUNWspro/bin/cc
-AS     = /opt/SUNWspro/bin/cc
-DIS     = /usr/ccs/bin/dis
-CP     = /bin/cp -f
-CFLAGS  += -g -xarch=v9
-
-## Special target to force target-dependent library to be compiled
-## directly to native code.
-## 
-$(LLCLIB): $(LLCLIB:.o=.c)
-       cd $(LEVEL)/test; $(MAKE) $(@F)
-
-#runtime.o: runtime.c
-#      $(CC) -c $(CCFLAGS) $<
-
 clean ::
-       $(RM) *.bc *.mc *.s *.o a.out core
+       $(RM) a.out core
        $(RM) -rf Output/
 
-%.mc: %.bc $(LLC) $(AS)
-       @echo "Generating machine instructions for $<"
-       $(LLC) -f -dsched y $(LLCFLAGS) $< > $@
+Output/%.ll: %.c $(LCC) Output/.dir
+       $(LCC) $(LCCFLAGS) -S $< -o $@
 
-%.trace.bc: %.bc $(LLC)
-       $(LLC) -f -trace $(LLCFLAGS) $<
+Output/%.bc: Output/%.ll $(LGCCAS)
+       $(LGCCAS) $< -o $@
 
+Output/%.bc: %.ll $(LAS)
+       $(LAS) $< -o $@
+
+#
+# Testing versions of provided utilities...
+#
+Output/%.tll: %.c $(LCC) Output/.dir
+       @echo "======== Compiling $<"
+       $(LCC) $(LCCFLAGS) -S $< -o $@ || \
+           ( rm -f $@; $(FAILURE) $@ )
+
+Output/%.tbc: Output/%.tll $(LAS)
+       @echo "======== Assembling $<"
+       $(LAS) -f $< -o $@ || \
+            ( rm -f $@; $(FAILURE) $@ )
 
-Output/%.ll: %.c $(LCC) Output/.dir
-       $(LCC) $(LCFLAGS) -S $< -o $@
 
-Output/%.bc: Output/%.ll $(LAS)
-       $(LAS) $< -o $@
 
 #%.s: %.linked.bc
-#      $(LLC) -f $(LCFLAGS) $< -o $@
+#      $(LLC) -f $(LLCFLAGS) $< -o $@
 
 #%: %.o $(LIBS)
 #      $(CC) $(LDFLAGS) $< $(LIBS) -o $@