[llvm-commits] CVS: llvm-test/Makefile.dummylib Makefile.programs Makefile.rules Makefile.tests

Reid Spencer reid at x10sys.com
Thu Feb 8 19:38:38 PST 2007 


Changes in directory llvm-test:

Makefile.dummylib updated: 1.7 -> 1.8
Makefile.programs updated: 1.255 -> 1.256
Makefile.rules updated: 1.23 -> 1.24
Makefile.tests updated: 1.14 -> 1.15
---
Log message:

Let's try using llvm-ld for the nightly test. If all goes well, gccld will
go away tomorrow. This patch replaces all uses of gccld with llvm-ld. 


---
Diffs of the changes:  (+28 -28)

 Makefile.dummylib |    2 +-
 Makefile.programs |   48 ++++++++++++++++++++++++------------------------
 Makefile.rules    |    4 ++--
 Makefile.tests    |    2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)


Index: llvm-test/Makefile.dummylib
diff -u llvm-test/Makefile.dummylib:1.7 llvm-test/Makefile.dummylib:1.8
--- llvm-test/Makefile.dummylib:1.7	Mon Jan 24 15:11:06 2005
+++ llvm-test/Makefile.dummylib	Thu Feb  8 21:38:16 2007
@@ -20,4 +20,4 @@
 LINKED_PROGS := $(PROGRAMS_TO_TEST:%=Output/%.lib.bc)
 
 $(LINKED_PROGS): Output/%.lib.bc: Output/%.llvm.bc $(DUMMYLIB)
-	$(LGCCLDPROG) --link-as-library $< $(DUMMYLIB) -o $@
+	$(LLVMLDPROG) --link-as-library $< $(DUMMYLIB) -o $@


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.255 llvm-test/Makefile.programs:1.256
--- llvm-test/Makefile.programs:1.255	Sun Feb  4 17:50:20 2007
+++ llvm-test/Makefile.programs	Thu Feb  8 21:38:16 2007
@@ -251,49 +251,49 @@
 # optimization...
 
 $(PROGRAMS_TO_TEST:%=Output/%.llvm.bc): \
-Output/%.llvm.bc: Output/%.linked.bc $(LGCCLDPROG)
-	-$(LGCCLD) $(STATS) $< $(EXTRA_LINKTIME_OPT_FLAGS) -lc $(LIBS) -o Output/$*.llvm
+Output/%.llvm.bc: Output/%.linked.bc $(LLVM_LDDPROG)
+	-$(LLVMLD) $(STATS) $< $(EXTRA_LINKTIME_OPT_FLAGS) -lc $(LIBS) -o Output/$*.llvm
 ifneq ($(OPTPASSES),)
 	-$(LOPT) -q $(OPTPASSES) $@ -o $@.tmp -f
 	$(MV) -f $@.tmp $@
 endif
 
 $(PROGRAMS_TO_TEST:%=Output/%.llvm): \
-Output/%.llvm: Output/%.linked.bc $(LGCCLDPROG)
-	-$(LGCCLD) $(STATS) $< -lc $(LIBS) -o Output/$*.llvm
+Output/%.llvm: Output/%.linked.bc $(LLVMLDPROG)
+	-$(LLVMLD) $(STATS) $< -lc $(LIBS) -o Output/$*.llvm
 ifneq ($(OPTPASSES),)
 	-$(LOPT) -q $(OPTPASSES) $@ -o $@.tmp -f
 	$(MV) -f $@.tmp $@
 endif
 
 $(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm.bc): \
-Output/%.noopt-llvm.bc: Output/%.linked.rbc $(LGCCLDPROG)
-	-$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -o Output/$*.noopt-llvm
+Output/%.noopt-llvm.bc: Output/%.linked.rbc $(LLVMLDPROG)
+	-$(LLVMLD) -disable-opt $(STATS) $< -lc $(LIBS) -o Output/$*.noopt-llvm
 
 $(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm): \
-Output/%.noopt-llvm: Output/%.linked.rbc $(LGCCLDPROG)
-	-$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -o Output/$*.noopt-llvm
+Output/%.noopt-llvm: Output/%.linked.rbc $(LLVMLDPROG)
+	-$(LLVMLD) -disable-opt $(STATS) $< -lc $(LIBS) -o Output/$*.noopt-llvm
 
 
-$(PROGRAMS_TO_TEST:%=Output/%.nogccldopt-llvm.bc): \
-Output/%.nogccldopt-llvm.bc: Output/%.linked.bc $(LGCCLDPROG)
-	-$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -o Output/$*.nogccldopt-llvm
+$(PROGRAMS_TO_TEST:%=Output/%.nollvm-ldopt-llvm.bc): \
+Output/%.nollvm-ldopt-llvm.bc: Output/%.linked.bc $(LLVMLDPROG)
+	-$(LLVMLD) -disable-opt $(STATS) $< -lc $(LIBS) -o Output/$*.nollvm-ldopt-llvm
 
-$(PROGRAMS_TO_TEST:%=Output/%.nogccldopt-llvm): \
-Output/%.nogccldopt-llvm: Output/%.linked.rbc $(LGCCLDPROG)
-	-$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS)  -o Output/$*.nogccldopt-llvm
+$(PROGRAMS_TO_TEST:%=Output/%.nollvm-ldopt-llvm): \
+Output/%.nollvm-ldopt-llvm: Output/%.linked.rbc $(LLVMLDPROG)
+	-$(LLVMLD) -disable-opt $(STATS) $< -lc $(LIBS)  -o Output/$*.nollvm-ldopt-llvm
 
 endif   # ifndef DISABLE_FOR_LLVM_PROGRAMS
 
-# Targets to get the pass arguments that gccas and gccld are using...
+# Targets to get the pass arguments that opt and llvm-ld are using...
 Output/opt-pass-args: $(LOPT) Output/.dir
 	-$(LLVMAS) < /dev/null -o - | \
 	  $(LOPT) $(EXTRA_LOPT_OPTIONS) -std-compile-opts -disable-output -debug-pass=Arguments 2>&1 | \
 	  sed 's/Pass Arguments: //' | sed 's/-emitbytecode//' > $@
 
-Output/gccld-pass-args: $(LGCCLDPROG) Output/.dir
-	$(LLVMAS) < /dev/null > Output/gccld.test.bc
-	$(LGCCLD) Output/gccld.test.bc -o Output/gccld.test-out -debug-pass=Arguments > $@.1 2>&1
+Output/llvm-ld-pass-args: $(LLVMLDPROG) Output/.dir
+	$(LLVMAS) < /dev/null > Output/llvm-ld.test.bc
+	$(LLVMLD) Output/llvm-ld.test.bc -o Output/llvm-ld.test-out -debug-pass=Arguments > $@.1 2>&1
 	sed 's/Pass Arguments: //' < $@.1 | sed 's/-emitbytecode//' > $@
 
 # If the program requires exception handling support, enable (potentially
@@ -431,15 +431,15 @@
 BUGPOINT_ARGS += --args -- $(RUN_OPTIONS)
 
 # Rules to bugpoint the GCCAS, GCCLD, LLC, or LLI commands...
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccas): \
-Output/%.bugpoint-gccas: Output/%.noopt-llvm.bc $(LBUGPOINT) \
+$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-opt): \
+Output/%.bugpoint-opt: Output/%.noopt-llvm.bc $(LBUGPOINT) \
                          Output/opt-pass-args Output/%.out-nat
 	$(LBUGPOINT) $< `cat Output/opt-pass-args` $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
 
-$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccld): \
-Output/%.bugpoint-gccld: Output/%.nogccldopt-llvm.bc $(LBUGPOINT) \
-                         Output/gccld-pass-args Output/%.out-nat
-	$(LBUGPOINT) $< `cat Output/gccld-pass-args` $(OPTPASSES) $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
+$(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llvm-ld): \
+Output/%.bugpoint-llvm-ld: Output/%.nollvm-ldopt-llvm.bc $(LBUGPOINT) \
+                         Output/llvm-ld-pass-args Output/%.out-nat
+	$(LBUGPOINT) $< `cat Output/llvm-ld-pass-args` $(OPTPASSES) $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llc): \
 Output/%.bugpoint-llc: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat


Index: llvm-test/Makefile.rules
diff -u llvm-test/Makefile.rules:1.23 llvm-test/Makefile.rules:1.24
--- llvm-test/Makefile.rules:1.23	Thu Jan 11 18:58:38 2007
+++ llvm-test/Makefile.rules	Thu Feb  8 21:38:16 2007
@@ -254,7 +254,7 @@
 BURG       := $(LLVMTOOLCURRENT)/burg$(EXEEXT)
 RunBurg    := $(BURG) $(BURG_OPTS)
 TBLGEN     := $(LLVMTOOLCURRENT)/tblgen$(EXEEXT)
-LGCCLDPROG := $(LLVMTOOLCURRENT)/gccld$(EXEEXT)
+LLVMLDPROG := $(LLVMTOOLCURRENT)/llvm-ld$(EXEEXT)
 
 #--------------------------------------------------------------------------
 # The LLVM GCC front-end in C and C++ flavors
@@ -276,7 +276,7 @@
 LLI       = $(LLVMTOOLCURRENT)/lli$(EXEEXT)
 LLC       = $(LLVMTOOLCURRENT)/llc$(EXEEXT)
 LGCCAS    = $(LLVMTOOLCURRENT)/gccas$(EXEEXT)
-LGCCLD    = $(LGCCLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
+LLVMLD    = $(LLVMLDPROG) -L$(LLVMGCCLIBDIR) -L$(LLVMGCCDIR)/lib
 LDIS      = $(LLVMTOOLCURRENT)/llvm-dis$(EXEEXT)
 LOPT      = $(LLVMTOOLCURRENT)/opt$(EXEEXT)
 LLINK     = $(LLVMTOOLCURRENT)/llvm-link$(EXEEXT)


Index: llvm-test/Makefile.tests
diff -u llvm-test/Makefile.tests:1.14 llvm-test/Makefile.tests:1.15
--- llvm-test/Makefile.tests:1.14	Fri Feb  2 22:30:17 2007
+++ llvm-test/Makefile.tests	Thu Feb  8 21:38:16 2007
@@ -19,7 +19,7 @@
 include ${LEVEL}/Makefile.common
 
 # Specify ENABLE_STATS on the command line to enable -stats and -time-passes
-# output from gccas and gccld.
+# output from opt and llvm-ld.
 ifdef ENABLE_STATS
 STATS = -stats -time-passes
 endif

More information about the llvm-commits mailing list