[llvm-commits] [test-suite] r96864 - in /test-suite/trunk: Makefile.dummylib Makefile.programs Makefile.rules MultiSource/Makefile.multisrc

[Daniel Dunbar]

Author: ddunbar
Date: Mon Feb 22 20:09:35 2010
New Revision: 96864

URL: http://llvm.org/viewvc/llvm-project?rev=96864&view=rev
Log:
Inline LLVMLDPROG into LLVMLD.

Modified:
    test-suite/trunk/Makefile.dummylib
    test-suite/trunk/Makefile.programs
    test-suite/trunk/Makefile.rules
    test-suite/trunk/MultiSource/Makefile.multisrc

Modified: test-suite/trunk/Makefile.dummylib
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.dummylib?rev=96864&r1=96863&r2=96864&view=diff
==============================================================================
--- test-suite/trunk/Makefile.dummylib (original)
+++ test-suite/trunk/Makefile.dummylib Mon Feb 22 20:09:35 2010
@@ -20,4 +20,4 @@
 LINKED_PROGS := $(PROGRAMS_TO_TEST:%=Output/%.lib.bc)
 
 $(LINKED_PROGS): Output/%.lib.bc: Output/%.llvm.bc $(DUMMYLIB)
-	$(LLVMLDPROG) --link-as-library $< $(DUMMYLIB) -o $@
+	$(LLVMLD) --link-as-library $< $(DUMMYLIB) -o $@

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=96864&r1=96863&r2=96864&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Mon Feb 22 20:09:35 2010
@@ -283,7 +283,7 @@
 endif
 
 $(PROGRAMS_TO_TEST:%=Output/%.llvm): \
-Output/%.llvm: Output/%.linked.bc $(LLVMLDPROG)
+Output/%.llvm: Output/%.linked.bc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(EXTRA_LINKTIME_OPT_FLAGS) $(LLVMLD_FLAGS) -lc $(LIBS) -o Output/$*.llvm
 ifneq ($(OPTPASSES),)
@@ -292,33 +292,33 @@
 endif
 
 $(PROGRAMS_TO_TEST:%=Output/%.llvm.optbeta.bc): \
-Output/%.llvm.optbeta.bc: Output/%.linked.optbeta.bc $(LLVMLDPROG)
+Output/%.llvm.optbeta.bc: Output/%.linked.optbeta.bc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(EXTRA_LINKTIME_OPT_FLAGS) $(LLVMLD_FLAGS) -lc $(LIBS) -o Output/$*.llvm.optbeta
 
 $(PROGRAMS_TO_TEST:%=Output/%.llvm.optbeta): \
-Output/%.llvm.optbeta: Output/%.linked.optbeta.bc $(LLVMLDPROG)
+Output/%.llvm.optbeta: Output/%.linked.optbeta.bc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(EXTRA_LINKTIME_OPT_FLAGS) $(LLVMLD_FLAGS) -lc $(LIBS) -o Output/$*.llvm.optbeta
 
 $(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm.bc): \
-Output/%.noopt-llvm.bc: Output/%.linked.rbc $(LLVMLDPROG)
+Output/%.noopt-llvm.bc: Output/%.linked.rbc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(LLVMLD_FLAGS) -lc $(LIBS) -o Output/$*.noopt-llvm
 
 $(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm): \
-Output/%.noopt-llvm: Output/%.linked.rbc $(LLVMLDPROG)
+Output/%.noopt-llvm: Output/%.linked.rbc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(LLVMLD_FLAGS) -lc $(LIBS) -o Output/$*.noopt-llvm
 
 
 $(PROGRAMS_TO_TEST:%=Output/%.nollvm-ldopt-llvm.bc): \
-Output/%.nollvm-ldopt-llvm.bc: Output/%.linked.bc $(LLVMLDPROG)
+Output/%.nollvm-ldopt-llvm.bc: Output/%.linked.bc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(LLVMLD_FLAGS) -lc $(LIBS) -o Output/$*.nollvm-ldopt-llvm
 
 $(PROGRAMS_TO_TEST:%=Output/%.nollvm-ldopt-llvm): \
-Output/%.nollvm-ldopt-llvm: Output/%.linked.rbc $(LLVMLDPROG)
+Output/%.nollvm-ldopt-llvm: Output/%.linked.rbc $(LLVMLD)
 	$(RUNTOOLSAFELY) $(LLVMLD) -disable-opt -info-output-file=$(CURDIR)/$@.info $(STATS) $< \
 		$(LLVMLD_FLAGS) -lc $(LIBS)  -o Output/$*.nollvm-ldopt-llvm
 

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=96864&r1=96863&r2=96864&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Mon Feb 22 20:09:35 2010
@@ -255,11 +255,6 @@
 ###########################################################################
 
 #--------------------------------------------------------------------------
-# Utilities used while building the LLVM tree, which live in the utils dir
-#
-LLVMLDPROG := $(LLVMTOOLCURRENT)/llvm-ld$(EXEEXT)
-
-#--------------------------------------------------------------------------
 # The LLVM GCC front-end in C and C++ flavors
 #
 ifeq ($(LLVMGCC_MAJVERS),3)
@@ -278,7 +273,7 @@
 # Makefile.rules) 
 LLI       = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
 LLC       = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
-LLVMLD    = $(LLVMLDPROG)
+LLVMLD    = $(LLVMTOOLCURRENT)/llvm-ld$(EXEEXT)
 LDIS      = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
 LOPT      = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
 LLINK     = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)

Modified: test-suite/trunk/MultiSource/Makefile.multisrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=96864&r1=96863&r2=96864&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Makefile.multisrc (original)
+++ test-suite/trunk/MultiSource/Makefile.multisrc Mon Feb 22 20:09:35 2010
@@ -53,8 +53,8 @@
 ifndef USE_PRECOMPILED_BYTECODE
 
 $(PROGRAMS_TO_TEST:%=Output/%.linked.rbc): \
-Output/%.linked.rbc: $(LObjects) $(LLVMLDPROG)
-	-$(LLVMLDPROG) -link-as-library -disable-opt $(LObjects) -o $@
+Output/%.linked.rbc: $(LObjects) $(LLVMLD)
+	-$(LLVMLD) -link-as-library -disable-opt $(LObjects) -o $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \
 Output/%.LOC.txt: $(Source)