Author: njn Date: 2009-04-24 21:17:07 +0100 (Fri, 24 Apr 2009) New Revision: 9611 Log: Merge r9610 (AM_CCASFLAGS tweaks for test Makefiles) from the DARWIN branch. Modified: trunk/Makefile.tool-tests.am trunk/cachegrind/tests/x86/Makefile.am trunk/exp-ptrcheck/tests/x86/Makefile.am trunk/memcheck/tests/amd64/Makefile.am trunk/memcheck/tests/x86-linux/Makefile.am trunk/memcheck/tests/x86/Makefile.am trunk/none/tests/amd64/Makefile.am trunk/none/tests/ppc32/Makefile.am trunk/none/tests/ppc64/Makefile.am trunk/none/tests/x86-linux/Makefile.am trunk/none/tests/x86/Makefile.am Modified: trunk/Makefile.tool-tests.am =================================================================== --- trunk/Makefile.tool-tests.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/Makefile.tool-tests.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -12,4 +12,7 @@ # as $(AM_FLAG_M3264_PRI). AM_CFLAGS = -Winline -Wall -Wshadow -g AM_CXXFLAGS = -Winline -Wall -Wshadow -g +# Include AM_CPPFLAGS in AM_CCASFLAGS to allow for older versions of +# automake; see comments in Makefile.flags.am for more detail. +AM_CCASFLAGS = $(AM_CPPFLAGS) Modified: trunk/cachegrind/tests/x86/Makefile.am =================================================================== --- trunk/cachegrind/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/cachegrind/tests/x86/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -10,8 +10,8 @@ fpu-28-108 -AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = $(AM_CPPFLAGS) @FLAG_M32@ +AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CCASFLAGS += @FLAG_M32@ fpu_28_108_SOURCES = fpu-28-108.S Modified: trunk/exp-ptrcheck/tests/x86/Makefile.am =================================================================== --- trunk/exp-ptrcheck/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/exp-ptrcheck/tests/x86/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -10,9 +10,9 @@ lea.vgtest-disabled lea.stderr.exp -AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = @FLAG_M32@ +AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CCASFLAGS += @FLAG_M32@ asm_SOURCES = asm.S lea_SOURCES = lea.S Modified: trunk/memcheck/tests/amd64/Makefile.am =================================================================== --- trunk/memcheck/tests/amd64/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/memcheck/tests/amd64/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -27,9 +27,9 @@ more_x87_fp sse_memory xor-undef-amd64 -AM_CFLAGS += @FLAG_M64@ -AM_CXXFLAGS += @FLAG_M64@ -AM_CCASFLAGS = @FLAG_M64@ +AM_CFLAGS += @FLAG_M64@ +AM_CXXFLAGS += @FLAG_M64@ +AM_CCASFLAGS += @FLAG_M64@ more_x87_fp_CFLAGS = $(AM_CFLAGS) -O -ffast-math -mfpmath=387 \ -mfancy-math-387 Modified: trunk/memcheck/tests/x86/Makefile.am =================================================================== --- trunk/memcheck/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/memcheck/tests/x86/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -40,9 +40,9 @@ tronical \ xor-undef-x86 -AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = @FLAG_M32@ +AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CCASFLAGS += @FLAG_M32@ # must be built with these flags -- bug only occurred with them fpeflags_CFLAGS = $(AM_CFLAGS) -march=i686 Modified: trunk/memcheck/tests/x86-linux/Makefile.am =================================================================== --- trunk/memcheck/tests/x86-linux/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/memcheck/tests/x86-linux/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -24,5 +24,5 @@ AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = @FLAG_M32@ +AM_CCASFLAGS += @FLAG_M32@ Modified: trunk/none/tests/amd64/Makefile.am =================================================================== --- trunk/none/tests/amd64/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/none/tests/amd64/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -63,9 +63,9 @@ check_PROGRAMS += ssse3_misaligned endif -AM_CFLAGS += @FLAG_M64@ -AM_CXXFLAGS += @FLAG_M64@ -AM_CCASFLAGS = @FLAG_M64@ +AM_CFLAGS += @FLAG_M64@ +AM_CXXFLAGS += @FLAG_M64@ +AM_CCASFLAGS += @FLAG_M64@ # generic C ones bug132918_LDADD = -lm Modified: trunk/none/tests/ppc32/Makefile.am =================================================================== --- trunk/none/tests/ppc32/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/none/tests/ppc32/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -29,9 +29,9 @@ ldstrev lsw jm-insns mftocrf mcrfs round test_fx test_gx \ testVMX twi tw xlc_dbl_u32 -AM_CFLAGS += @FLAG_M32@ -AM_CXXFLAGS += @FLAG_M32@ -AM_CCASFLAGS = @FLAG_M32@ +AM_CFLAGS += @FLAG_M32@ +AM_CXXFLAGS += @FLAG_M32@ +AM_CCASFLAGS += @FLAG_M32@ jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec @FLAG_M32@ testVMX_CFLAGS = $(AM_CFLAGS) -O -g -Wall -maltivec -mabi=altivec -DALTIVEC \ Modified: trunk/none/tests/ppc64/Makefile.am =================================================================== --- trunk/none/tests/ppc64/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/none/tests/ppc64/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -16,8 +16,8 @@ check_PROGRAMS = \ jm-insns lsw round std_reg_imm twi_tdi tw_td -AM_CFLAGS += @FLAG_M64@ -AM_CXXFLAGS += @FLAG_M64@ -AM_CCASFLAGS = @FLAG_M64@ +AM_CFLAGS += @FLAG_M64@ +AM_CXXFLAGS += @FLAG_M64@ +AM_CCASFLAGS += @FLAG_M64@ jm_insns_CFLAGS = $(AM_CFLAGS) -Winline -Wall -O -g -mregnames -maltivec @FLAG_M64@ Modified: trunk/none/tests/x86/Makefile.am =================================================================== --- trunk/none/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/none/tests/x86/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -90,9 +90,9 @@ endif -AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = $(AM_CPPFLAGS) @FLAG_M32@ +AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) +AM_CCASFLAGS += @FLAG_M32@ # generic C ones Modified: trunk/none/tests/x86-linux/Makefile.am =================================================================== --- trunk/none/tests/x86-linux/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) +++ trunk/none/tests/x86-linux/Makefile.am 2009-04-24 20:17:07 UTC (rev 9611) @@ -14,6 +14,6 @@ AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE) -AM_CCASFLAGS = @FLAG_M32@ +AM_CCASFLAGS += @FLAG_M32@ |