|
From: <sv...@va...> - 2009-04-24 20:05:58
|
Author: njn Date: 2009-04-24 21:05:44 +0100 (Fri, 24 Apr 2009) New Revision: 9610 Log: Make handling of CCASFLAGS in tool-test Makefiles more consistent and less prone to breakage with older automakes. Modified: branches/DARWIN/Makefile.tool-tests.am branches/DARWIN/cachegrind/tests/x86/Makefile.am branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am branches/DARWIN/memcheck/tests/amd64/Makefile.am branches/DARWIN/memcheck/tests/darwin/Makefile.am branches/DARWIN/memcheck/tests/x86-linux/Makefile.am branches/DARWIN/memcheck/tests/x86/Makefile.am branches/DARWIN/none/tests/amd64/Makefile.am branches/DARWIN/none/tests/ppc32/Makefile.am branches/DARWIN/none/tests/ppc64/Makefile.am branches/DARWIN/none/tests/x86-linux/Makefile.am branches/DARWIN/none/tests/x86/Makefile.am Modified: branches/DARWIN/Makefile.tool-tests.am =================================================================== --- branches/DARWIN/Makefile.tool-tests.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/Makefile.tool-tests.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -12,6 +12,9 @@ # 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) # On Darwin, for a program 'p', the DWARF debug info is stored in the Modified: branches/DARWIN/cachegrind/tests/x86/Makefile.am =================================================================== --- branches/DARWIN/cachegrind/tests/x86/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/cachegrind/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -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: branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am =================================================================== --- branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -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: branches/DARWIN/memcheck/tests/amd64/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/amd64/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/memcheck/tests/amd64/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -35,9 +35,9 @@ sse_memory 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@ more_x87_fp_CFLAGS = $(AM_CFLAGS) -O -ffast-math -mfpmath=387 \ -mfancy-math-387 Modified: branches/DARWIN/memcheck/tests/darwin/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/darwin/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/memcheck/tests/darwin/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -16,5 +16,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: branches/DARWIN/memcheck/tests/x86/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/x86/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/memcheck/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -46,9 +46,9 @@ pushfpopf endif -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@ # fpeflags must use these flags -- bug only occurred with them. Modified: branches/DARWIN/memcheck/tests/x86-linux/Makefile.am =================================================================== --- branches/DARWIN/memcheck/tests/x86-linux/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/memcheck/tests/x86-linux/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -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: branches/DARWIN/none/tests/amd64/Makefile.am =================================================================== --- branches/DARWIN/none/tests/amd64/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/none/tests/amd64/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -76,9 +76,9 @@ slahf-amd64 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: branches/DARWIN/none/tests/ppc32/Makefile.am =================================================================== --- branches/DARWIN/none/tests/ppc32/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/none/tests/ppc32/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -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: branches/DARWIN/none/tests/ppc64/Makefile.am =================================================================== --- branches/DARWIN/none/tests/ppc64/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/none/tests/ppc64/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -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: branches/DARWIN/none/tests/x86/Makefile.am =================================================================== --- branches/DARWIN/none/tests/x86/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/none/tests/x86/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -88,9 +88,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@ # Some of the tests (bug125959_x86, bug152818_x86, insn_*) need # -mdynamic-no-pic. I tried setting *_CFLAGS separately for all of them, Modified: branches/DARWIN/none/tests/x86-linux/Makefile.am =================================================================== --- branches/DARWIN/none/tests/x86-linux/Makefile.am 2009-04-24 14:49:50 UTC (rev 9609) +++ branches/DARWIN/none/tests/x86-linux/Makefile.am 2009-04-24 20:05:44 UTC (rev 9610) @@ -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@ |