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

[Misha Brukman]

Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.39 -> 1.39.2.1

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+12 -7)

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.39 llvm/test/Programs/MultiSource/Makefile.multisrc:1.39.2.1
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.39	Tue Jan 13 15:56:51 2004
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Mon Mar  1 17:59:09 2004
@@ -15,7 +15,7 @@
 
 ## LLVM bytecode libraries that must be linked with an application
 # FIXME: LIBS SHOULD BE SPECIFIED
-LIBS = -lm
+LIBS += -lm
 
 include $(LEVEL)/test/Programs/Makefile.programs
 
@@ -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)