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

[Duncan Sands]

Author: baldrick
Date: Tue Nov  1 04:22:51 2011
New Revision: 143456

URL: http://llvm.org/viewvc/llvm-project?rev=143456&view=rev
Log:
In two cases where llvm-ld is being used as a simple bitcode linker
use llvm-link instead.  It's not clear where llvm-ld is going: if it
will be removed or turned into a real linker.  Whichever one it is
it seems pointless to use it for this.

Modified:
    test-suite/trunk/Makefile.dummylib
    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=143456&r1=143455&r2=143456&view=diff
==============================================================================
--- test-suite/trunk/Makefile.dummylib (original)
+++ test-suite/trunk/Makefile.dummylib Tue Nov  1 04:22:51 2011
@@ -20,4 +20,4 @@
 LINKED_PROGS := $(PROGRAMS_TO_TEST:%=Output/%.lib.bc)
 
 $(LINKED_PROGS): Output/%.lib.bc: Output/%.llvm.bc $(DUMMYLIB)
-	$(LLVMLD) --link-as-library $< $(DUMMYLIB) -o $@
+	$(LLINK) $< $(DUMMYLIB) -o $@

Modified: test-suite/trunk/MultiSource/Makefile.multisrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=143456&r1=143455&r2=143456&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Makefile.multisrc (original)
+++ test-suite/trunk/MultiSource/Makefile.multisrc Tue Nov  1 04:22:51 2011
@@ -75,8 +75,8 @@
 ifndef USE_PRECOMPILED_BYTECODE
 
 $(PROGRAMS_TO_TEST:%=Output/%.linked.rbc): \
-Output/%.linked.rbc: $(LObjects) $(LLVMLD)
-	-$(LLVMLD) -link-as-library -disable-opt $(LObjects) -o $@
+Output/%.linked.rbc: $(LObjects) $(LLINK)
+	-$(LLINK) $(LObjects) -o $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \
 Output/%.LOC.txt: $(Source)