<div dir="ltr">Thanks Will, LGTM.<div><br></div><div style> - Daniel</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Feb 8, 2013 at 6:50 AM, Will Schmidt <span dir="ltr"><<a href="mailto:will_schmidt@vnet.ibm.com" target="_blank">will_schmidt@vnet.ibm.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: willschm<br>
Date: Fri Feb 8 08:50:04 2013<br>
New Revision: 174712<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=174712&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=174712&view=rev</a><br>
Log:<br>
Update Makefile.{singlesrc,multisrc} to use X_TARGET_FLAGS<br>
<br>
The LNT test harness handles TARGET_FLAGS specially, and prevents other<br>
users of the variable from functioning as intended, i.e. "TARGET_FLAGS<br>
+= -maltivec" does not work as intended.<br>
X_TARGET_FLAGS exists to work around this, but was not utilized in<br>
Makefile.{singlesrc,multisrc}. Update those makefiles to use<br>
X_TARGET_FLAGS, and update Altivec/Makefile appropriately.<br>
<br>
<br>
<br>
Modified:<br>
test-suite/trunk/MultiSource/Makefile.multisrc<br>
test-suite/trunk/SingleSource/Makefile.singlesrc<br>
test-suite/trunk/SingleSource/UnitTests/Vector/Altivec/Makefile<br>
<br>
Modified: test-suite/trunk/MultiSource/Makefile.multisrc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=174712&r1=174711&r2=174712&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=174712&r1=174711&r2=174712&view=diff</a><br>
==============================================================================<br>
--- test-suite/trunk/MultiSource/Makefile.multisrc (original)<br>
+++ test-suite/trunk/MultiSource/Makefile.multisrc Fri Feb 8 08:50:04 2013<br>
@@ -31,35 +31,35 @@ NLObjects := $(addprefix Output/,$(NLObj<br>
.PRECIOUS: $(LObjects) $(NObjects) $(NLObjects)<br>
<br>
Output/%.o: %.c Output/.dir<br>
- -$(CC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ -$(CC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
<br>
Output/%.o: %.C Output/.dir<br>
- -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
<br>
Output/%.o: %.cpp Output/.dir<br>
- -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
<br>
Output/%.o: %.cc Output/.dir<br>
- -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
<br>
Output/%.llvm.o: %.c Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.m Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.C Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.cpp Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.cc Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.mm Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
<br>
bugpoint-opt: Output/$(PROG).bugpoint-opt<br>
bugpoint-gccas: Output/$(PROG).bugpoint-opt<br>
@@ -89,10 +89,10 @@ BEGIN { real = 0.0; user = 0.0; sys =<br>
/^user/ { user += $$2; }\<br>
/^sys/ { sys += $$2; }\<br>
END { printf("real %f\nuser %f\nsys %f\n", real, user, sys); }' > $@.compile.time<br>
- -$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $(NLObjects) $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)<br>
+ -$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $(NLObjects) $(LDFLAGS) $(CFLAGS) $(X_TARGET_FLAGS)<br>
<br>
Output/%.native: $(NObjects) $(GeneratedTestInputs)<br>
- -$(CXX) -o $@ $(NObjects) $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)<br>
+ -$(CXX) -o $@ $(NObjects) $(LDFLAGS) $(CFLAGS) $(X_TARGET_FLAGS)<br>
<br>
# A simple target to run findmisopt when bugpoint isn't helping<br>
findmisopt:<br>
<br>
Modified: test-suite/trunk/SingleSource/Makefile.singlesrc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Makefile.singlesrc?rev=174712&r1=174711&r2=174712&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Makefile.singlesrc?rev=174712&r1=174711&r2=174712&view=diff</a><br>
==============================================================================<br>
--- test-suite/trunk/SingleSource/Makefile.singlesrc (original)<br>
+++ test-suite/trunk/SingleSource/Makefile.singlesrc Fri Feb 8 08:50:04 2013<br>
@@ -57,88 +57,88 @@ endif<br>
<br>
Output/%.llvm.o: %.c Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.m Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.C Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.cpp Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.cc Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
Output/%.llvm.o: %.mm Output/.dir<br>
$(RUNSAFELYLOCAL) /dev/null $@.compile \<br>
- $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) -c $< -o $@<br>
+ $(LCXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) -c $< -o $@<br>
.PRECIOUS: Output/%.llvm.o<br>
<br>
Output/%.simple: Output/%.llvm.o Output/.dir<br>
-$(CP) $<.compile.time $@.compile.time<br>
- -$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $< $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)<br>
+ -$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $< $(LDFLAGS) $(CFLAGS) $(X_TARGET_FLAGS)<br>
<br>
# FIXME: LIBS should be specified, not hardcoded to -lm<br>
Output/%.native: $(SourceDir)/%.c Output/.dir<br>
- -$(CC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native: $(SourceDir)/%.cpp Output/.dir<br>
- -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native: $(SourceDir)/%.m Output/.dir<br>
- -$(CC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CC) $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native: $(SourceDir)/%.mm Output/.dir<br>
- -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg: $(SourceDir)/%.c Output/.dir<br>
- -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg: $(SourceDir)/%.cpp Output/.dir<br>
- -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg: $(SourceDir)/%.m Output/.dir<br>
- -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg: $(SourceDir)/%.mm Output/.dir<br>
- -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg.opt: $(SourceDir)/%.c Output/.dir<br>
- -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg.opt: $(SourceDir)/%.cpp Output/.dir<br>
- -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg.opt: $(SourceDir)/%.m Output/.dir<br>
- -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.native.dbg.opt: $(SourceDir)/%.mm Output/.dir<br>
- -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(CXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg: $(SourceDir)/%.c Output/.dir<br>
- -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg: $(SourceDir)/%.cpp Output/.dir<br>
- -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg: $(SourceDir)/%.m Output/.dir<br>
- -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg: $(SourceDir)/%.mm Output/.dir<br>
- -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg.opt: $(SourceDir)/%.c Output/.dir<br>
- -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg.opt: $(SourceDir)/%.cpp Output/.dir<br>
- -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg.opt: $(SourceDir)/%.m Output/.dir<br>
- -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCC) -g $(CPPFLAGS) $(CFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
Output/%.dbg.opt: $(SourceDir)/%.mm Output/.dir<br>
- -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
+ -$(LCXX) -g $(CPPFLAGS) $(CXXFLAGS) $(OPTFLAGS) $(X_TARGET_FLAGS) $< -lm -o $@ $(LDFLAGS)<br>
<br>
bugpoint-gccas bugpoint-opt bugpoint-jit bugpoint-llc bugpoint-llc-beta:<br>
@echo "The $@ target doesn't work in SingleSource. Try:"<br>
<br>
Modified: test-suite/trunk/SingleSource/UnitTests/Vector/Altivec/Makefile<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/Altivec/Makefile?rev=174712&r1=174711&r2=174712&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/UnitTests/Vector/Altivec/Makefile?rev=174712&r1=174711&r2=174712&view=diff</a><br>
==============================================================================<br>
--- test-suite/trunk/SingleSource/UnitTests/Vector/Altivec/Makefile (original)<br>
+++ test-suite/trunk/SingleSource/UnitTests/Vector/Altivec/Makefile Fri Feb 8 08:50:04 2013<br>
@@ -9,6 +9,8 @@ DIRS =<br>
FP_TOLERANCE := 0.002<br>
<br>
TARGET_FLAGS += -maltivec<br>
+# setting TEST_TARGET_FLAGS is needed within the LNT environment.<br>
+TEST_TARGET_FLAGS += -maltivec<br>
LCCFLAGS += -maltivec<br>
<br>
include $(LEVEL)/SingleSource/Makefile.singlesrc<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>