[llvm-commits] [test-suite] r94151 - /test-suite/trunk/Makefile.programs

[Evan Cheng]

Author: evancheng
Date: Thu Jan 21 21:38:29 2010
New Revision: 94151

URL: http://llvm.org/viewvc/llvm-project?rev=94151&view=rev
Log:
Unbreak make bugpoint-llc-beta and bugpoint-opt-beta.

Modified:
    test-suite/trunk/Makefile.programs

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=94151&r1=94150&r2=94151&view=diff

==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Thu Jan 21 21:38:29 2010
@@ -542,10 +542,10 @@
 BUGPOINT_OPTIONS += -timeout=$(RUNTIMELIMIT)
 BUGPOINT_OPTIONS += --tool-args $(LLCFLAGS)
 ifeq ($(ARCH),x86)
-BUGPOINT_OPTIONS += -gcc-tool-args -m32
+BUGPOINT_TOOL_OPTIONS = -gcc-tool-args -m32
 endif
 ifeq ($(ARCH),x86_64)
-BUGPOINT_OPTIONS += -gcc-tool-args -m64
+BUGPOINT_TOOL_OPTIONS += -gcc-tool-args -m64
 endif
 BUGPOINT_ARGS += --args -- $(RUN_OPTIONS)
 
@@ -553,32 +553,39 @@
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-opt): \
 Output/%.bugpoint-opt: Output/%.noopt-llvm.bc $(LBUGPOINT) \
                          Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< -std-compile-opts $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< -std-compile-opts \
+          $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llvm-ld): \
 Output/%.bugpoint-llvm-ld: Output/%.nollvm-ldopt-llvm.bc $(LBUGPOINT) \
                          Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< -std-link-opts $(OPTPASSES) $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< -std-link-opts $(OPTPASSES) \
+	  $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llc): \
 Output/%.bugpoint-llc: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) $< -run-llc $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) $< -run-llc \
+	  $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-llc-beta): \
 Output/%.bugpoint-llc-beta: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) $< -run-llc $(BUGPOINT_OPTIONS) $(LLCBETAOPTION) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) $< -run-llc \
+          $(BUGPOINT_OPTIONS) $(LLCBETAOPTION) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-opt-beta): \
 Output/%.bugpoint-opt-beta: Output/%.linked.rbc $(LBUGPOINT) Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $<  $(BUGPOINT_OPTIONS) $(LLCBETAOPTION) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) -llc-safe $< \
+          $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(OPTBETAOPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-jit): \
 Output/%.bugpoint-jit: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) $< -run-jit -safe-run-llc $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) $< -run-jit -safe-run-llc \
+          $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.bugpoint-cbe): \
 Output/%.bugpoint-cbe: Output/%.llvm.bc $(LBUGPOINT) Output/%.out-nat
-	PWD=$(CURDIR) $(LBUGPOINT) $< -cbe-bug $(BUGPOINT_OPTIONS) $(BUGPOINT_ARGS)
+	PWD=$(CURDIR) $(LBUGPOINT) $< -cbe-bug \
+          $(BUGPOINT_OPTIONS) $(BUGPOINT_TOOL_OPTIONS) $(BUGPOINT_ARGS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.misopt.out): \
 Output/%.misopt.out: Output/%.linked.rbc $(LFINDMISOPT)