From 7b65c22fbc44c95238f6b772f6da7b9bc5f09ac5 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 23 Feb 2009 01:18:06 +0000
Subject: [PATCH] Some more test/build cleanups missed in prior commits.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9227
---
 cachegrind/tests/x86/Makefile.am   | 7 ++++++-
 exp-ptrcheck/tests/x86/Makefile.am | 9 +++++----
 none/tests/x86/Makefile.am         | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cachegrind/tests/x86/Makefile.am b/cachegrind/tests/x86/Makefile.am
index 3e693bd1a4..8c8e7e24a7 100644
--- a/cachegrind/tests/x86/Makefile.am
+++ b/cachegrind/tests/x86/Makefile.am
@@ -1,3 +1,6 @@
+
+include $(top_srcdir)/Makefile.tool-tests.am
+
 noinst_SCRIPTS = filter_stderr
 
 EXTRA_DIST = $(noinst_SCRIPTS) \
@@ -6,7 +9,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 check_PROGRAMS = \
 	fpu-28-108
 
-AM_CFLAGS    = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g
+
+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 3532e43d56..d697258ba1 100644
--- a/exp-ptrcheck/tests/x86/Makefile.am
+++ b/exp-ptrcheck/tests/x86/Makefile.am
@@ -1,4 +1,6 @@
 
+include $(top_srcdir)/Makefile.tool-tests.am
+
 noinst_SCRIPTS = filter_stderr
 
 check_PROGRAMS = asm lea
@@ -7,10 +9,9 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	asm.vgtest-disabled asm.stderr.exp \
 	lea.vgtest-disabled lea.stderr.exp
 
-AM_CPPFLAGS  = -I$(top_srcdir)/include
-AM_CFLAGS    = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g \
-		$(FLAG_MMMX) $(FLAG_MSSE)
-AM_CXXFLAGS  = $(AM_CFLAGS)
+
+AM_CFLAGS   += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CCASFLAGS = @FLAG_M32@
 
 asm_SOURCES = asm.S
diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index f018e68f56..dd427c8af7 100644
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -28,8 +28,8 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 	bug137714-x86.stderr.exp bug137714-x86.stdout.exp bug137714-x86.vgtest \
 	bug152818-x86.vgtest bug152818-x86.stdout.exp \
 	bug152818-x86.stderr.exp \
-	cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \
 	cmpxchg8b.stderr.exp cmpxchg8b.stdout.exp cmpxchg8b.vgtest \
+	cpuid.stderr.exp cpuid.stdout.exp cpuid.vgtest \
 	cse_fail.stderr.exp cse_fail.stdout.exp cse_fail.vgtest \
 	faultstatus.disabled faultstatus.stderr.exp \
 	fcmovnu.vgtest fcmovnu.stderr.exp fcmovnu.stdout.exp \
-- 
2.47.3