[llvm-commits] [test-suite] r61053 - in /test-suite/trunk: Makefile.rules Makefile.tests

[Chris Lattner]

Author: lattner
Date: Mon Dec 15 15:53:47 2008
New Revision: 61053

URL: http://llvm.org/viewvc/llvm-project?rev=61053&view=rev
Log:
remove some old llvm-upgrade cruft. 
Instead of emitting the full command line to build each file with 
llvm-gcc, just emit a nice "Compiling" line.

Modified:
    test-suite/trunk/Makefile.rules
    test-suite/trunk/Makefile.tests

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=61053&r1=61052&r2=61053&view=diff

==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Mon Dec 15 15:53:47 2008
@@ -283,12 +283,6 @@
 LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 LFINDMISOPT= $(LLVM_SRC_ROOT)/utils/findmisopt
 LLVMC     = $(LLVMTOOLCURRENT)/llvmc$(EXEEXT)
-LUPGRADE  = $(LLVMTOOLCURRENT)/llvm-upgrade$(EXEEXT)
-ifeq ($(LLVMGCC_MAJVERS),3)
-UPGRADE_LL= $(LUPGRADE) $(1) -o $(1).up.tmp -f ; $(MV) $(1).up.tmp $(1)
-else
-UPGRADE_LL=
-endif
 
 
 

Modified: test-suite/trunk/Makefile.tests
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.tests?rev=61053&r1=61052&r2=61053&view=diff

==============================================================================
--- test-suite/trunk/Makefile.tests (original)
+++ test-suite/trunk/Makefile.tests Mon Dec 15 15:53:47 2008
@@ -43,33 +43,33 @@
 
 # Compile from X.c to Output/X.bc
 Output/%.bc: %.c $(LCC1) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cpp to Output/X.bc
 Output/%.bc: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cc to Output/X.bc
 Output/%.bc: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.C to Output/X.bc
 Output/%.bc: %.C $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.m to Output/X.bc
 Output/%.bc: %.m $(LCC1) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.mm to Output/X.bc
 Output/%.bc: %.mm $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.