Fix a couple of tests that could be built with the wrong options, including

the -m32/-m64 option.

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

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 250380974d11068abc587b95be9e2d163e477e12..0b9e0f55aa00fef75e7886b22520700a4b2cc0c5 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -237,6 +237,8 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
 if VGCONF_OS_IS_DARWIN
 atomic_incs_CFLAGS = $(AM_CFLAGS) -mdynamic-no-pic
+else
+atomic_incs_CFLAGS = $(AM_CFLAGS)
 endif
 
 deep_templates_SOURCES = deep_templates.cpp

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 46353e8c7c42aa912346db813c1c2da449204cc8..44e2636a4c1cf2f2be1d9035622a38cea1e1e751 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,5 +27,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
 
 if VGCONF_OS_IS_DARWIN
 x86_amd64_features_CFLAGS = $(AM_CFLAGS) -mdynamic-no-pic
+else
+x86_amd64_features_CFLAGS = $(AM_CFLAGS)
 endif