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

[Chris Lattner]

Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.40 -> 1.41

---
Log message:

Instead of builing a .rbc file by using:
  llvm-as  X.ll -o - | opt -funcresolve -o X.rbc

and linking the program with:
  llvm-link X.rbc Y.rbc | opt -funcresolve 

Just use the gccas/gccld utilities in -disable-opt mode.  This speeds up the
time to build 176.gcc.linked.rll from 224s to 117s, which should make testing
go faster.  Also, and almost as important, if you recompile 'opt' you won't 
have to rerun all of these steps.



---
Diffs of the changes:  (+11 -6)

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.40 llvm/test/Programs/MultiSource/Makefile.multisrc:1.41
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.40	Fri Feb  6 14:35:17 2004
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Sun Feb 22 14:18:18 2004
@@ -42,19 +42,24 @@
 bugpoint-jit:   Output/$(PROG).bugpoint-jit
 bugpoint-llc:   Output/$(PROG).bugpoint-llc
 
-# Raw bytecode files are files created by simply linking the output of the GCC
-# frontend without running gccas.
+# Raw bytecode files are files created by simply assembling the output of the
+# GCC frontend, without running any optimizations.
 #
-Output/%.rbc: Output/%.ll $(LLVMAS)
-	$(LLVMAS) -f $< -o - | $(LOPT) -f -q -funcresolve -o $@
+Output/%.rbc: Output/%.ll $(LGCCAS)
+	$(LGCCAS) -disable-opt $< -o $@
 
 ifndef USE_PRECOMPILED_BYTECODE
 
+$(PROGRAMS_TO_TEST:%=Output/%.linked.rbc): \
+Output/%.linked.rbc: $(LObjects) $(LGCCLDPROG)
+	$(LGCCLDPROG) -link-as-library -disable-opt $(LObjects) -o $@
+
 # Output/*.linked.ll is all of the bytecode files of the program linked together
 # without any libraries linked in...
 #
-Output/%.linked.rll: $(LObjects) $(LLINK) $(LOPT) $(LDIS)
-	$(LLINK) -f $(LObjects) | $(LOPT) -funcresolve -deadtypeelim -q | $(LDIS) > $@
+$(PROGRAMS_TO_TEST:%=Output/%.linked.rll): \
+Output/%.linked.rll: Output/%.linked.rbc $(LDIS)
+	$(LDIS) $< -o $@ -f
 
 $(PROGRAMS_TO_TEST:%=Output/%.LOC.txt): \
 Output/%.LOC.txt: $(Source)