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

[Chris Lattner]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.32 -> 1.33

---
Log message:

Unify building processes between multisrc and singlesrc makefiles


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.32 llvm/test/Programs/Makefile.programs:1.33
--- llvm/test/Programs/Makefile.programs:1.32	Tue Jan 21 10:24:11 2003
+++ llvm/test/Programs/Makefile.programs	Tue Jan 21 15:31:59 2003
@@ -44,6 +44,7 @@
 
 .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s
 .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc
+.PRECIOUS: Output/%.linked.bc
 
 PROGDIR = $(LEVEL)/test/Programs
 
@@ -61,7 +62,8 @@
 # correctly, this script has no effect, otherwise it will do things like print a
 # stack trace of a core dump.  It always returns "successful" so that tests will
 # continue to be run.
-RUNSAFELY = $(PROGDIR)/RunSafely.sh
+ULIMIT   := ulimit -t 30
+RUNSAFELY = $(ULIMIT); $(PROGDIR)/RunSafely.sh
 
 #
 # Targets to build for the default target...
@@ -141,6 +143,21 @@
 all:: $(LLIDIFFS)
 endif
 
+# Given a version of the entire program linked together into a single unit of
+# raw output from the C frontend, optimize it.
+Output/%.linked.bc: Output/%.linked.rll $(LGCCAS)
+	$(LGCCAS) $(STATS) $< -o $@
+
+# Rule to produce final program bytecode file from linked, optimized, bytecode.
+ifndef USE_PRECOMPILED_BYTECODE
+
+# Link the program to the libraries it uses, then perform postlink
+# optimization...
+Output/%.llvm Output/%.llvm.bc: Output/%.linked.bc
+	$(LGCCLD) $(STATS) $< -lgcc -lc $(LIBS) -o Output/$*.llvm
+
+endif
+
 #
 # Rules to compile the program for the C Back End
 #
@@ -162,23 +179,25 @@
 ifndef USE_PRECOMPILED_BYTECODE
 $(PROGRAMS_TO_TEST:%=Output/%.out-nat): \
 Output/%.out-nat: Output/%.native
-	$(RUNSAFELY) $< > $@ $(RUN_OPTIONS)
+	-$(RUNSAFELY) $< > $@ $(RUN_OPTIONS)
 endif
 
 LLI_OPTS := -q -abort-on-exception -force-interpreter=true
+JIT_OPTS := -force-interpreter=false
+
 $(PROGRAMS_TO_TEST:%=Output/%.out-lli): \
 Output/%.out-lli: Output/%.llvm.bc $(LLI)
-	$(RUNSAFELY) $(LLI) $(LLI_OPTS) $< > $@ $(RUN_OPTIONS)
+	-$(RUNSAFELY) $(LLI) $(LLI_OPTS) $< > $@ $(RUN_OPTIONS)
 
 $(PROGRAMS_TO_TEST:%=Output/%.out-jit): \
 Output/%.out-jit: Output/%.llvm.bc $(LLI)
-	$(RUNSAFELY) $(LLI) -force-interpreter=false $< > $@ $(RUN_OPTIONS)
+	-$(RUNSAFELY) $(LLI) $(JIT_OPTS) $< > $@ $(RUN_OPTIONS)
 $(PROGRAMS_TO_TEST:%=Output/%.out-llc): \
 Output/%.out-llc: Output/%.llc
-	$(RUNSAFELY) $< > $@ $(RUN_OPTIONS)
+	-$(RUNSAFELY) $< > $@ $(RUN_OPTIONS)
 $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
 Output/%.out-cbe: Output/%.cbe
-	$(RUNSAFELY) $< > $@ $(RUN_OPTIONS)
+	-$(RUNSAFELY) $< > $@ $(RUN_OPTIONS)
 
 #
 # Rules to diff test output...