Changes in directory llvm-test:
Makefile.rules updated: 1.18 -> 1.19
Makefile.tests updated: 1.12 -> 1.13
---
Log message:
Handle upgrade of llvm-gcc3 output by running llvm-upgrade on it.
---
Diffs of the changes: (+11 -0)
Makefile.rules | 7 +++++++
Makefile.tests | 4 ++++
2 files changed, 11 insertions(+)
Index: llvm-test/Makefile.rules
diff -u llvm-test/Makefile.rules:1.18 llvm-test/Makefile.rules:1.19
--- llvm-test/Makefile.rules:1.18 Tue Nov 7 17:17:30 2006
+++ llvm-test/Makefile.rules Sun Dec 3 15:15:49 2006
@@ -281,6 +281,13 @@
LPROF = $(LLVMTOOLCURRENT)/llvm-prof$(EXEEXT)
LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
LLVMC = $(LLVMTOOLCURRENT)/llvmc$(EXEEXT)
+LUPGRADE = $(LLVMTOOLCURRENT)/llvm-upgrade$(EXEEXT)
+ifeq ($(LLVMGCC_MAJVERS),3)
+UPGRADE_LL= $(LUPGRADE) $(1) -o $(1).up.tmp -f ; $(MV) $(1).up.tmp $(1)
+else
+UPGRADE_LL=
+endif
+
###########################################################################
Index: llvm-test/Makefile.tests
diff -u llvm-test/Makefile.tests:1.12 llvm-test/Makefile.tests:1.13
--- llvm-test/Makefile.tests:1.12 Mon Oct 9 13:24:03 2006
+++ llvm-test/Makefile.tests Sun Dec 3 15:15:49 2006
@@ -51,18 +51,22 @@
# Compile from X.c to Output/X.ll
Output/%.ll: %.c $(LCC1) Output/.dir $(INCLUDES)
-$(LLVMGCC) $(CPPFLAGS) $(LCCFLAGS) $(TARGET_FLAGS) -O0 -S $< -o $@
-emit-llvm
+ -$(call UPGRADE_LL,$@)
# Compile from X.cpp to Output/X.ll
Output/%.ll: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) $(TARGET_FLAGS) -O0 -S $< -o $@
-emit-llvm
+ -$(call UPGRADE_LL,$@)
# Compile from X.cc to Output/X.ll
Output/%.ll: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) $(TARGET_FLAGS) -O0 -S $< -o $@
-emit-llvm
+ -$(call UPGRADE_LL,$@)
# Compile from X.C to Output/X.ll
Output/%.ll: %.C $(LCC1XX) Output/.dir $(INCLUDES)
-$(LLVMGXX) $(CPPFLAGS) $(LCXXFLAGS) $(TARGET_FLAGS) -O0 -S $< -o $@
-emit-llvm
+ -$(call UPGRADE_LL,$@)
# LLVM Assemble from Output/X.ll to Output/X.bc. Output/X.ll must have come
# from GCC output, so use GCCAS.
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
