[llvm-commits] [test-suite] r96886 - in /test-suite/trunk: Makefile.rules Makefile.tests TEST.dbgopt.Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Mon Feb 22 23:33:42 2010
New Revision: 96886

URL: http://llvm.org/viewvc/llvm-project?rev=96886&view=rev
Log:
Introduce L{CC,CXX} replacements for LLVM{GCC,GXX}.

Modified:
    test-suite/trunk/Makefile.rules
    test-suite/trunk/Makefile.tests
    test-suite/trunk/TEST.dbgopt.Makefile

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=96886&r1=96885&r2=96886&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Mon Feb 22 23:33:42 2010
@@ -271,6 +271,9 @@
 LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 LFINDMISOPT= $(LLVM_SRC_ROOT)/utils/findmisopt
 
+LCC := $(LLVMGCC)
+LCXX := $(LLVMGXX)
+LCC_PROGRAMS := $(LCC) $(LCXX) $(LLVMCC1) $(LLVMCC1PLUS)
 
 
 ###########################################################################
@@ -597,7 +600,7 @@
 # Rules for building libraries
 #--------------------------------------------------------------------
 
-LinkBCLib := $(LLVMGCC) -shared -nostdlib
+LinkBCLib := $(LCC) -shared -nostdlib
 ifdef EXPORTED_SYMBOL_LIST
 LinkBCLib += -Xlinker -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST)
 else
@@ -793,8 +796,6 @@
 
 endif
 
-LCC_PROGRAMS := $(LLVMCC1) $(LLVMCC1PLUS)
-
 #---------------------------------------------------------
 .PRECIOUS: $(PROJ_OBJ_DIR)/Depend/.dir $(PROJ_OBJ_DIR)/BytecodeObj/.dir
 .PRECIOUS: $(PROJ_OBJ_DIR)/Debug/.dir $(PROJ_OBJ_DIR)/Release/.dir
@@ -820,10 +821,10 @@
 	$(CompileCG) $< -o $@
 
 $(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.cpp $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC_PROGRAMS)
-	$(LLVMGXX) $(CPPFLAGS) -c $< -o $@
+	$(LCXX) $(CPPFLAGS) -c $< -o $@
 
 $(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.c $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LCC_PROGRAMS)
-	$(LLVMGCC) $(CPPFLAGS) -c $< -o $@
+	$(LCC) $(CPPFLAGS) -c $< -o $@
 
 $(PROJ_OBJ_DIR)/BytecodeObj/%.bc: %.ll $(PROJ_OBJ_DIR)/BytecodeObj/.dir $(LLVMAS)
 	$(LLVMAS) $< -o $@
@@ -951,3 +952,11 @@
 endif
 
 endif  # ifndef DISABLE_AUTO_DEPENDENCIES
+
+###
+# Debugging
+
+# General debugging rule, use 'make dbg-print-XXX' to print the
+# definition, value and origin of XXX.
+make-print-%:
+	$(error PRINT: $(value $*) = "$($*)" (from $(origin $*)))

Modified: test-suite/trunk/Makefile.tests
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.tests?rev=96886&r1=96885&r2=96886&view=diff
==============================================================================
--- test-suite/trunk/Makefile.tests (original)
+++ test-suite/trunk/Makefile.tests Mon Feb 22 23:33:42 2010
@@ -39,27 +39,27 @@
 
 # Compile from X.c to Output/X.bc
 Output/%.bc: %.c $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
+	-$(LCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cpp to Output/X.bc
 Output/%.bc: %.cpp $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cc to Output/X.bc
 Output/%.bc: %.cc $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.C to Output/X.bc
 Output/%.bc: %.C $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.m to Output/X.bc
 Output/%.bc: %.m $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
+	-$(LCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.mm to Output/X.bc
 Output/%.bc: %.mm $(LCC_PROGRAMS) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
+	-$(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.

Modified: test-suite/trunk/TEST.dbgopt.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.dbgopt.Makefile?rev=96886&r1=96885&r2=96886&view=diff
==============================================================================
--- test-suite/trunk/TEST.dbgopt.Makefile (original)
+++ test-suite/trunk/TEST.dbgopt.Makefile Mon Feb 22 23:33:42 2010
@@ -17,8 +17,8 @@
 $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
 test.$(TEST).%: Output/%.diff
 
-Output/%.diff: %.cpp Output/.dir $(LLVMGXX) $(LOPT) $(LDIS)
-	$(LLVMGXX) $*.cpp -g --emit-llvm -c -o Output/$*.bc 
+Output/%.diff: %.cpp Output/.dir $(LCC_PROGRAMS) $(LOPT) $(LDIS)
+	$(LCXX) $*.cpp -g --emit-llvm -c -o Output/$*.bc 
 	$(LOPT) Output/$*.bc -strip-nondebug -strip-debug | $(LOPT) -std-compile-opts | $(LOPT) -strip -f -o Output/$*.t.bc 
 	$(LDIS) Output/$*.t.bc -f -o Output/$*.first.ll 
 	$(LOPT) Output/$*.bc -strip-nondebug | $(LOPT) -std-compile-opts | $(LOPT) -strip-debug -strip -f -o Output/$*.t.bc 
@@ -30,8 +30,8 @@
 	fi
 
 
-Output/%.diff: %.c Output/.dir $(LLVMGCC) $(LOPT) $(LDIS)
-	$(LLVMGCC) $*.c -g --emit-llvm -c -o Output/$*.bc 
+Output/%.diff: %.c Output/.dir $(LCC_PROGRAMS) $(LOPT) $(LDIS)
+	$(LCC) $*.c -g --emit-llvm -c -o Output/$*.bc 
 	$(LOPT) Output/$*.bc -strip-nondebug -strip-debug | $(LOPT) -std-compile-opts | $(LOPT) -strip -f -o Output/$*.t.bc 
 	$(LDIS) Output/$*.t.bc -f -o Output/$*.first.ll 
 	$(LOPT) Output/$*.bc -strip-nondebug | $(LOPT) -std-compile-opts | $(LOPT) -strip-debug -strip -f -o Output/$*.t.bc