[llvm-commits] CVS: llvm/test/Programs/Makefile.programs

[Chris Lattner]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.112 -> 1.113

---
Log message:

Give bugpoint a chance of actually working out-of-the-box, by linking in
libraries so that all symbols (such as __main) are resolved.  This should
make the 'bugpoint-gccas' "just work".


---
Diffs of the changes:  (+16 -2)

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.112 llvm/test/Programs/Makefile.programs:1.113
--- llvm/test/Programs/Makefile.programs:1.112	Mon Feb  9 10:02:40 2004
+++ llvm/test/Programs/Makefile.programs	Tue Feb 10 10:25:44 2004
@@ -201,6 +201,12 @@
 Output/%.llvm.stripped.bc: Output/%.llvm.bc $(LOPT)
 	$(LOPT) -mstrip $< -o $@ -f
 
+
+$(PROGRAMS_TO_TEST:%=Output/%.noopt-linked.bc): \
+Output/%.noopt-linked.bc: Output/%.linked.rll $(LGCCAS)
+	$(LGCCAS) $(STATS) -disable-opt $< -o $@
+
+
 ifndef DISABLE_FOR_LLVM_PROGRAMS
 # Rule to produce final program bytecode file from linked, optimized, bytecode.
 # Link the program to the libraries it uses, then perform postlink
@@ -221,6 +227,14 @@
 	$(LOPT) -q $(OPTPASSES) < $@ > $@.tmp
 	$(MV) -f $@.tmp $@
 endif
+
+$(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm.bc): \
+Output/%.noopt-llvm.bc: Output/%.noopt-linked.bc $(LGCCLDPROG)
+	$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -lcrtend -o Output/$*.noopt-llvm
+
+$(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm): \
+Output/%.noopt-llvm: Output/%.noopt-linked.bc $(LGCCLDPROG)
+	$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -lcrtend -o Output/$*.noopt-llvm
 endif   # ifndef DISABLE_FOR_LLVM_PROGRAMS
 
 # Targets to get the pass arguments that gccas and gccld are using...
@@ -344,12 +358,12 @@
 
 # Rules to bugpoint the GCCAS, GCCLD, LLC, or LLI commands...
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccas): \
-Output/%.bugpoint-gccas: Output/%.linked.rll $(LBUGPOINT) \
+Output/%.bugpoint-gccas: Output/%.noopt-llvm.bc $(LBUGPOINT) \
                          Output/gccas-pass-args Output/%.out-nat
 	$(LBUGPOINT) $< `cat Output/gccas-pass-args` $(BUGPOINT_OPTIONS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccld): \
-Output/%.bugpoint-gccld: Output/%.linked.bc $(LBUGPOINT) \
+Output/%.bugpoint-gccld: Output/%.noopt-llvm.bc $(LBUGPOINT) \
                          Output/gccld-pass-args Output/%.out-nat
 	$(LBUGPOINT) $< `cat Output/gccld-pass-args` $(BUGPOINT_OPTIONS)