Merge r9610 (AM_CCASFLAGS tweaks for test Makefiles) from the DARWIN branch.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9611

diff --git a/Makefile.tool-tests.am b/Makefile.tool-tests.am
index aaed77bb1e578051ac3057268ef3cd6a443abd92..b81d3e5837ff58073568dd491850b3766a1b1213 100644 (file)
--- a/Makefile.tool-tests.am
+++ b/Makefile.tool-tests.am
@@ -12,4 +12,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
 # 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)
 

diff --git a/cachegrind/tests/x86/Makefile.am b/cachegrind/tests/x86/Makefile.am
index db9a8758678b9884c6d13536aad912268775585f..12d96e9b46f7bbe400d203431c4b033c38e30831 100644 (file)
--- a/cachegrind/tests/x86/Makefile.am
+++ b/cachegrind/tests/x86/Makefile.am
@@ -10,8 +10,8 @@ check_PROGRAMS = \
        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

diff --git a/exp-ptrcheck/tests/x86/Makefile.am b/exp-ptrcheck/tests/x86/Makefile.am
index d697258ba181ac548fad541636b5bc657b202c03..7aa8beedd3e44391647ae49aff7253c6cd23c94c 100644 (file)
--- a/exp-ptrcheck/tests/x86/Makefile.am
+++ b/exp-ptrcheck/tests/x86/Makefile.am
@@ -10,9 +10,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
        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

diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 1f0a111b478d9b5f7bf3dacb92c770634eac2f01..bb1c8032a40872d5d6c264707d28da9d2d46ea0f 100644 (file)
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -27,9 +27,9 @@ check_PROGRAMS = bt_everything bug132146 defcfaexpr fxsave-amd64 \
                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

diff --git a/memcheck/tests/x86-linux/Makefile.am b/memcheck/tests/x86-linux/Makefile.am
index c32296a77741b1d30f4be46097135bb3e5f568f0..3f18f1417ccc0ee0b95ad29ea20d41a176c9d4f6 100644 (file)
--- a/memcheck/tests/x86-linux/Makefile.am
+++ b/memcheck/tests/x86-linux/Makefile.am
@@ -24,5 +24,5 @@ check_PROGRAMS = \
 
 AM_CFLAGS    += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CXXFLAGS  += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CCASFLAGS  = @FLAG_M32@
+AM_CCASFLAGS += @FLAG_M32@
 

diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am
index fca09994d5b2eccede591d5ad398512f90b22df4..4bbb831c76316c729eb330ad7d67711a04999411 100644 (file)
--- a/memcheck/tests/x86/Makefile.am
+++ b/memcheck/tests/x86/Makefile.am
@@ -40,9 +40,9 @@ check_PROGRAMS = \
        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

diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index b1a5b68fea812dec137c6bf3872d37f9b7636c44..13621d08bf4fb325e8c5dab16de327208736b222 100644 (file)
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -63,9 +63,9 @@ if BUILD_SSSE3_TESTS
  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

diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
index 6d926a1429943ae03130f25676b1cb7903144fbb..d964a2acd9b71b53e420fd3fdb2876cb3069bac1 100644 (file)
--- a/none/tests/ppc32/Makefile.am
+++ b/none/tests/ppc32/Makefile.am
@@ -29,9 +29,9 @@ check_PROGRAMS = \
        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 \

diff --git a/none/tests/ppc64/Makefile.am b/none/tests/ppc64/Makefile.am
index 763d1bf3cb94408d3e47dc9d1d6c077b4a3a9b54..1399e3d9146d3ccb0da987f385c628e8a8858783 100644 (file)
--- a/none/tests/ppc64/Makefile.am
+++ b/none/tests/ppc64/Makefile.am
@@ -16,8 +16,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 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@

diff --git a/none/tests/x86-linux/Makefile.am b/none/tests/x86-linux/Makefile.am
index a4634dae648f928a04866e06e658f686e488883a..ea80609cf1d65486ed365ca72f3aef9b28deeaeb 100644 (file)
--- a/none/tests/x86-linux/Makefile.am
+++ b/none/tests/x86-linux/Makefile.am
@@ -14,6 +14,6 @@ check_PROGRAMS = \
 
 AM_CFLAGS    += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CXXFLAGS  += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CCASFLAGS  = @FLAG_M32@
+AM_CCASFLAGS += @FLAG_M32@
 
 

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index bce98a83f528ed2712c1f0cf489b2a765ea51112..16493fc88886492e6dfe2f873c56caf50ed19752 100644 (file)
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -90,9 +90,9 @@ if BUILD_SSSE3_TESTS
 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