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

[Chris Lattner]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.127 -> 1.128

---
Log message:

Allow specification of both a relative and abs tolerance
Fix bugpoint-gccld target to run the gccas optimizations first


---
Diffs of the changes:  (+14 -5)

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.127 llvm/test/Programs/Makefile.programs:1.128
--- llvm/test/Programs/Makefile.programs:1.127	Tue Apr 13 16:01:13 2004
+++ llvm/test/Programs/Makefile.programs	Sat Apr 17 18:24:42 2004
@@ -57,11 +57,10 @@
 
 TOLERANCEOPT :=
 ifdef FP_TOLERANCE
-TOLERANCEOPT := -r $(FP_TOLERANCE)
-else
-ifdef FP_ABSTOLERANCE
-TOLERANCEOPT := -a $(FP_ABSTOLERANCE)
+TOLERANCEOPT += -r $(FP_TOLERANCE)
 endif
+ifdef FP_ABSTOLERANCE
+TOLERANCEOPT += -a $(FP_ABSTOLERANCE)
 endif
 
 # DIFFPROG - The program used to diff the output
@@ -246,6 +245,16 @@
 $(PROGRAMS_TO_TEST:%=Output/%.noopt-llvm): \
 Output/%.noopt-llvm: Output/%.linked.rbc $(LGCCLDPROG)
 	-$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -lcrtend -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) -lcrtend -o Output/$*.nogccldopt-llvm
+
+$(PROGRAMS_TO_TEST:%=Output/%.nogccldopt-llvm): \
+Output/%.nogccldopt-llvm: Output/%.linked.rbc $(LGCCLDPROG)
+	-$(LGCCLD) -disable-opt $(STATS) $< -lc $(LIBS) -lcrtend -o Output/$*.nogccldopt-llvm
+
 endif   # ifndef DISABLE_FOR_LLVM_PROGRAMS
 
 # Targets to get the pass arguments that gccas and gccld are using...
@@ -373,7 +382,7 @@
 	$(LBUGPOINT) $< `cat Output/gccas-pass-args` $(BUGPOINT_OPTIONS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-gccld): \
-Output/%.bugpoint-gccld: Output/%.noopt-llvm.bc $(LBUGPOINT) \
+Output/%.bugpoint-gccld: Output/%.nogccldopt-llvm.bc $(LBUGPOINT) \
                          Output/gccld-pass-args Output/%.out-nat
 	$(LBUGPOINT) $< `cat Output/gccld-pass-args` $(BUGPOINT_OPTIONS)