diff options
author | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-04-24 20:17:07 +0000 |
---|---|---|
committer | njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2009-04-24 20:17:07 +0000 |
commit | c9a6f4b6c33014aa3259182b1623a7669011f805 (patch) | |
tree | a0bd90fad802b464e78fac7e48eb2e7c9d13959a | |
parent | 25a439a019a91500666e54e8b8f5a6a9c820ab30 (diff) | |
download | valgrind-c9a6f4b6c33014aa3259182b1623a7669011f805.tar.gz |
Merge r9610 (AM_CCASFLAGS tweaks for test Makefiles) from the DARWIN branch.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9611 a5019735-40e9-0310-863c-91ae7b9d1cf9
-rw-r--r-- | Makefile.tool-tests.am | 3 | ||||
-rw-r--r-- | cachegrind/tests/x86/Makefile.am | 6 | ||||
-rw-r--r-- | exp-ptrcheck/tests/x86/Makefile.am | 6 | ||||
-rw-r--r-- | memcheck/tests/amd64/Makefile.am | 6 | ||||
-rw-r--r-- | memcheck/tests/x86-linux/Makefile.am | 2 | ||||
-rw-r--r-- | memcheck/tests/x86/Makefile.am | 6 | ||||
-rw-r--r-- | none/tests/amd64/Makefile.am | 6 | ||||
-rw-r--r-- | none/tests/ppc32/Makefile.am | 6 | ||||
-rw-r--r-- | none/tests/ppc64/Makefile.am | 6 | ||||
-rw-r--r-- | none/tests/x86-linux/Makefile.am | 2 | ||||
-rw-r--r-- | none/tests/x86/Makefile.am | 6 |
11 files changed, 29 insertions, 26 deletions
diff --git a/Makefile.tool-tests.am b/Makefile.tool-tests.am index aaed77bb1..b81d3e583 100644 --- 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 db9a87586..12d96e9b4 100644 --- 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 d697258ba..7aa8beedd 100644 --- 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 1f0a111b4..bb1c8032a 100644 --- 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 c32296a77..3f18f1417 100644 --- 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 fca09994d..4bbb831c7 100644 --- 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 b1a5b68fe..13621d08b 100644 --- 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 6d926a142..d964a2acd 100644 --- 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 763d1bf3c..1399e3d91 100644 --- 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 a4634dae6..ea80609cf 100644 --- 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 bce98a83f..16493fc88 100644 --- 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 |