diff options
author | Brian Gaeke <gaeke@uiuc.edu> | 2004-01-13 21:56:30 +0000 |
---|---|---|
committer | Brian Gaeke <gaeke@uiuc.edu> | 2004-01-13 21:56:30 +0000 |
commit | 5c59be95521d70d2429319de2cb5f2ea9ba4385d (patch) | |
tree | f5ec16d5b8e598ec86e5944137fb965de1f03c82 /test/Makefile.tests | |
parent | a3a6524965416647883bc0b78ff6f18fb3f7b5fc (diff) | |
download | llvm-5c59be95521d70d2429319de2cb5f2ea9ba4385d.tar.gz llvm-5c59be95521d70d2429319de2cb5f2ea9ba4385d.tar.bz2 llvm-5c59be95521d70d2429319de2cb5f2ea9ba4385d.tar.xz |
Remove dead definitions of NATGCC and CP, and dead .tll, .tbc rules.
Make should continue even if compilation cmds fail, for the sake of
the nightly tester, so use minuses on them.
Use LLVMAS, LLVMGCC, LLVMGXX instead of LAS, LCC, LCXX (as per FIXME).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10825 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Makefile.tests')
-rw-r--r-- | test/Makefile.tests | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/test/Makefile.tests b/test/Makefile.tests index 03124dfb99..7824c78a27 100644 --- a/test/Makefile.tests +++ b/test/Makefile.tests @@ -60,10 +60,6 @@ TESTRUNR = @echo Running test: $<; \ PATH=$(LLVMTOOLCURRENT):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH) \ $(LLVM_SRC_ROOT)/test/TestRunner.sh -# Native Tool Definitions -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 = @@ -85,46 +81,27 @@ clean:: # Compile from X.c to Output/X.ll Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES) - $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ + -$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ # Compile from X.cpp to Output/X.ll Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES) - $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ + -$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ # Compile from X.cc to Output/X.ll Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES) - $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ + -$(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. # Output/%.bc: Output/%.ll $(LGCCAS) - $(LGCCAS) $(STATS) $< -o $@ + -$(LLVMAS) $(STATS) $< -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 $@ - -# -# Testing versions of provided utilities... -# -Output/%.tll: %.c $(LCC1) Output/.dir $(INCLUDES) - @echo "======== Compiling $<" - $(LCC) $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@ || \ - ( rm -f $@; $(FAILURE) $@ ) - -Output/%.tll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES) - @echo "======== Compiling $<" - $(LCXX) $(CPPFLAGS) $(LCXXFLAGS) -S $< -o $@ || \ - ( rm -f $@; $(FAILURE) $@ ) - -Output/%.tbc: Output/%.tll $(LAS) - @echo "======== Assembling $<" - $(LAS) -f $< -o $@ || \ - ( rm -f $@; $(FAILURE) $@ ) - +Output/%.bc: %.ll $(LLVMAS) Output/.dir + -$(LLVMAS) -f $< -o $@ ## Cancel built-in implicit rules that override above rules %: %.s |