[llvm-commits] CVS: llvm/projects/Stacker/test/Makefile

[Reid Spencer]

Changes in directory llvm/projects/Stacker/test:

Makefile updated: 1.7 -> 1.8
---
Log message:

Use llvmc to compile test cases

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

Index: llvm/projects/Stacker/test/Makefile
diff -u llvm/projects/Stacker/test/Makefile:1.7 llvm/projects/Stacker/test/Makefile:1.8
--- llvm/projects/Stacker/test/Makefile:1.7	Sat Oct 30 04:25:27 2004
+++ llvm/projects/Stacker/test/Makefile	Sat Nov 20 15:03:34 2004
@@ -31,37 +31,30 @@
 TESTS = $(LOGIC_TESTS) $(ARITHMETIC_TESTS) $(BITWISE_TESTS) $(STACK_TESTS) \
 	$(MEMORY_TESTS) $(CONTROL_TESTS) $(IO_TESTS)
 
-STKRC_EXEC = $(BUILD_OBJ_ROOT)/tools/$(CONFIGURATION)/stkrc
+LLVMC = $(LLVMToolDir)/llvmc
 
 all :: test_each
 
 test_each: $(TESTS)
 	$(Echo) "Running Tests..."
-	$(Verb) LD_LIBRARY_PATH=$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) $(BUILD_SRC_DIR)/runtests $(BUILD_OBJ_DIR) $(TESTS) 
+	$(Verb) LD_LIBRARY_PATH=$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) \
+	  $(BUILD_SRC_DIR)/runtests $(BUILD_OBJ_DIR) $(TESTS) 
 
-%.bc : %.st Makefile
-	$(Echo) "Compiling And Optimizing $< to $*.bc"
-	$(Verb)$(STKRC_EXEC) -f -O4 -s 2048 -o $*.bc $(BUILD_SRC_DIR)/$*.st
-
-%.s : %.bc testing.bc
-	$(Echo) "Assembling $< to $*.s"
-	$(Verb)$(LLINK) $*.bc testing.bc -o $*.bcl
-	$(Verb)$(LLC) -f -o $*.s $*.bcl
-
-% : %.s
-	$(Echo) "Linking $*"
-	$(Verb)$(CC) -ggdb -L$(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION) -lstkr_runtime -o $* $*.s
-
-%.ll : %.bc
-	$(Echo) "Disassembling $< to $*.ll"
-	$(Verb)$(LDIS) -dis -o $*.ll $<
+% : %.st Makefile testing.bc
+	$(Echo) "Building $*" 
+	$(Verb)$(LLVMC) -O4 -o $@ $< testing.bc -lstkr_runtime -lcrtend
+
+testing.bc : testing.st Makefile
+	$(Echo) "Compiling $*"
+	$(Verb)$(LLVMC) -O3 -c -o $@ $<
 
 TESTS_LL = $(TESTS:%=%.ll)
 TESTS_BC = $(TESTS:%=%.bc)
 TESTS_S  = $(TESTS:%=%.s)
 
 clean :: 
-	$(Verb)rm -f gmon.out $(TESTS_LL) $(TESTS_BC) $(TESTS_S) $(TESTS) testing.bc testing.s testing.ll
+	$(Verb)rm -f gmon.out $(TESTS_LL) $(TESTS_BC) $(TESTS_S) $(TESTS) \
+	  testing.bc testing.s testing.ll
 
 .SUFFIXES: .st .s .ll .bc
 .PRECIOUS: %.s %.ll %.bc %.st