[llvm-commits] [test-suite] r155145 - in /test-suite/trunk: External/SPEC/Makefile.spec Makefile.programs Makefile.rules MultiSource/Makefile.multisrc SingleSource/Makefile.singlesrc

Michael J. Spencer bigcheesegs at gmail.com
Thu Apr 19 11:36:51 PDT 2012 

Author: mspencer
Date: Thu Apr 19 13:36:50 2012
New Revision: 155145

URL: http://llvm.org/viewvc/llvm-project?rev=155145&view=rev
Log:
Remove llvm-ld from the test suite. This will be followed by a patch to LLVM to
remove llvm-ld.

Modified:
    test-suite/trunk/External/SPEC/Makefile.spec
    test-suite/trunk/Makefile.programs
    test-suite/trunk/Makefile.rules
    test-suite/trunk/MultiSource/Makefile.multisrc
    test-suite/trunk/SingleSource/Makefile.singlesrc

Modified: test-suite/trunk/External/SPEC/Makefile.spec
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/Makefile.spec?rev=155145&r1=155144&r2=155145&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/Makefile.spec (original)
+++ test-suite/trunk/External/SPEC/Makefile.spec Thu Apr 19 13:36:50 2012
@@ -197,7 +197,7 @@
 BUGPOINT_OPTIONS += --tool-args $(LLCFLAGS)
 BUGPOINT_ARGS += --args -- $(RUN_OPTIONS)
 
-# Rules to bugpoint the opt, llvm-ld, llc, or lli commands...
+# Rules to bugpoint the opt, llc, or lli commands...
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-opt): \
 Output/%.bugpoint-opt: Output/%.noopt-llvm.bc $(LBUGPOINT) \
                          Output/%.out-nat
@@ -206,14 +206,6 @@
 	    $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
 	@echo "===> Leaving Output/bugpoint-$(RUN_TYPE)"
 
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llvm-ld): \
-Output/%.bugpoint-llvm-ld: Output/%.nollvm-ldopt-llvm.bc $(LBUGPOINT) \
-                         Output/%.out-nat
-	$(SPEC_SANDBOX) bugpoint-$(RUN_TYPE) $@ $(REF_IN_DIR) \
-	    env PWD=$(CURDIR) $(LBUGPOINT) -llc-safe ../$*.nollvm-ldopt-llvm.bc -std-link-opts $(OPTPASSES) \
-	    $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
-	@echo "===> Leaving Output/bugpoint-$(RUN_TYPE)"
-
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llc): \
 Output/%.bugpoint-llc: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
 	$(SPEC_SANDBOX) bugpoint-$(RUN_TYPE) $@ $(REF_IN_DIR) \

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=155145&r1=155144&r2=155145&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Thu Apr 19 13:36:50 2012
@@ -306,12 +306,6 @@
 		-info-output-file=$(CURDIR)/$@.info \
 			$(STATS) $< -o $@
 
-$(PROGRAMS_TO_TEST:%=Output/%.nollvm-ldopt-llvm.bc): \
-Output/%.nollvm-ldopt-llvm.bc: Output/%.linked.bc $(LOPT)
-	$(RUNTOOLSAFELY) $(LOPT) \
-		-info-output-file=$(CURDIR)/$@.info \
-			$(STATS) $< -o $@
-
 endif   # ifndef DISABLE_FOR_LLVM_PROGRAMS
 
 # Disable asm-verbose.  This can slow down compilation and is not what the
@@ -629,19 +623,13 @@
 endif
 BUGPOINT_ARGS += --args -- $(RUN_OPTIONS)
 
-# Rules to bugpoint the opt, llvm-ld, llc, or lli commands...
+# Rules to bugpoint the opt, llc, or lli commands...
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-opt): \
 Output/%.bugpoint-opt: Output/%.noopt-llvm.bc $(LBUGPOINT) \
                          Output/%.out-nat
 	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< -std-compile-opts \
           $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llvm-ld): \
-Output/%.bugpoint-llvm-ld: Output/%.nollvm-ldopt-llvm.bc $(LBUGPOINT) \
-                         Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< -std-link-opts $(OPTPASSES) \
-	  $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
-
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llc): \
 Output/%.bugpoint-llc: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
 	PWD=$(CURDIR) $(LBUGPOINT) $< -run-llc \

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=155145&r1=155144&r2=155145&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Thu Apr 19 13:36:50 2012
@@ -328,7 +328,6 @@
 # Makefile.rules) 
 LLI       = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
 LLC       = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
-LLVMLD    = $(LLVMTOOLCURRENT)/llvm-ld$(EXEEXT)
 LDIS      = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
 LOPT      = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
 LLINK     = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)
@@ -391,7 +390,7 @@
 # If LTO is on, compile each .c .cpp file with -mllvm -disable-llvm-optzns.
 # This is similar to -O0, except it just disables optimizations and doesn't
 # change the behavior of the front-end. Optimization will be done separately
-# with opt and llvm-ld.
+# with opt.
 ifdef DISABLE_LTO
 LOPTFLAGS := $(OPTFLAGS)
 else

Modified: test-suite/trunk/MultiSource/Makefile.multisrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=155145&r1=155144&r2=155145&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Makefile.multisrc (original)
+++ test-suite/trunk/MultiSource/Makefile.multisrc Thu Apr 19 13:36:50 2012
@@ -63,8 +63,6 @@
 
 bugpoint-opt: Output/$(PROG).bugpoint-opt
 bugpoint-gccas: Output/$(PROG).bugpoint-opt
-bugpoint-llvm-ld: Output/$(PROG).bugpoint-llvm-ld
-bugpoint-gccld: Output/$(PROG).bugpoint-llvm-ld
 bugpoint-jit:   Output/$(PROG).bugpoint-jit
 bugpoint-llc:   Output/$(PROG).bugpoint-llc
 bugpoint-llc-beta: Output/$(PROG).bugpoint-llc-beta

Modified: test-suite/trunk/SingleSource/Makefile.singlesrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Makefile.singlesrc?rev=155145&r1=155144&r2=155145&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Makefile.singlesrc (original)
+++ test-suite/trunk/SingleSource/Makefile.singlesrc Thu Apr 19 13:36:50 2012
@@ -133,6 +133,6 @@
 Output/%.dbg.opt: $(SourceDir)/%.mm Output/.dir
 	-$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)
 
-bugpoint-gccas bugpoint-opt bugpoint-llvm-ld bugpoint-gccld bugpoint-jit bugpoint-llc bugpoint-llc-beta:
+bugpoint-gccas bugpoint-opt bugpoint-jit bugpoint-llc bugpoint-llc-beta:
 	@echo "The $@ target doesn't work in SingleSource.  Try:"
 	@echo "  'make Output/[programname].$@' instead."

More information about the llvm-commits mailing list