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