|
From: <sv...@va...> - 2009-02-22 23:38:16
|
Author: njn Date: 2009-02-22 23:38:10 +0000 (Sun, 22 Feb 2009) New Revision: 9222 Log: Test files were being passed multiple arch options (eg. "-m32 -m64") when built. This worked fine on the x86/Linux and AMD64/Linux but broke ppc*/Linux. This commit fixes the problem. Thanks to Bart for spotting it. Modified: trunk/Makefile.tool-tests.am trunk/cachegrind/tests/Makefile.am trunk/drd/tests/Makefile.am trunk/exp-ptrcheck/tests/Makefile.am trunk/helgrind/tests/Makefile.am trunk/massif/tests/Makefile.am trunk/memcheck/tests/Makefile.am trunk/none/tests/Makefile.am Modified: trunk/Makefile.tool-tests.am =================================================================== --- trunk/Makefile.tool-tests.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/Makefile.tool-tests.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -6,7 +6,8 @@ -DVGA_$(VGCONF_ARCH_PRI)=1 \ -DVGO_$(VGCONF_OS)=1 \ -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1 -AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI) -AM_CXXFLAGS = $(AM_CFLAGS) +# Nb: Tools need to augment these flags with an arch-selection option, such +# as $(AM_FLAG_M3264_PRI). +AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g +AM_CXXFLAGS = $(WERROR) -Winline -Wall -Wshadow -g - Modified: trunk/cachegrind/tests/Makefile.am =================================================================== --- trunk/cachegrind/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/cachegrind/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -20,6 +20,9 @@ check_PROGRAMS = \ chdir clreq dlclose myprint.so +AM_CFLAGS += $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) + # C ones dlclose_LDADD = -ldl myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -shared -fPIC Modified: trunk/drd/tests/Makefile.am =================================================================== --- trunk/drd/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/drd/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -240,7 +240,9 @@ endif -AM_CFLAGS += @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter +AM_CFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter + LDADD = -lpthread Modified: trunk/exp-ptrcheck/tests/Makefile.am =================================================================== --- trunk/exp-ptrcheck/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/exp-ptrcheck/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -75,6 +75,9 @@ stackerr \ strcpy strlen sub supp syscall tricky unaligned xor zero +AM_CFLAGS += $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) + # To make it a bit more realistic, build hackedbz2.c with at # least some optimisation. hackedbz2_CFLAGS = $(AM_CFLAGS) -O Modified: trunk/helgrind/tests/Makefile.am =================================================================== --- trunk/helgrind/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/helgrind/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -155,6 +155,8 @@ check_PROGRAMS += bar_bad bar_trivial endif +AM_CFLAGS += $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) LDADD = -lpthread Modified: trunk/massif/tests/Makefile.am =================================================================== --- trunk/massif/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/massif/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -61,6 +61,9 @@ thresholds \ zero +AM_CFLAGS += $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) + # C++ tests new_cpp_SOURCES = new-cpp.cpp overloaded_new_SOURCES = overloaded-new.cpp Modified: trunk/memcheck/tests/Makefile.am =================================================================== --- trunk/memcheck/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/memcheck/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -226,6 +226,8 @@ wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \ writev zeropage +AM_CFLAGS += $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) # Extra stuff for C tests memcmptest_CFLAGS = $(AM_CFLAGS) -fno-builtin-memcmp Modified: trunk/none/tests/Makefile.am =================================================================== --- trunk/none/tests/Makefile.am 2009-02-22 23:06:44 UTC (rev 9221) +++ trunk/none/tests/Makefile.am 2009-02-22 23:38:10 UTC (rev 9222) @@ -149,6 +149,9 @@ tls tls.so tls2.so vgprintf \ coolo_sigaction gxx304 +AM_CFLAGS += $(AM_FLAG_M3264_PRI) +AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) + # Extra stuff for C tests ansi_CFLAGS = $(AM_CFLAGS) -ansi floored_LDADD = -lm |