From de920a14ce46960ce2ae2846eb43bea482d3d009 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <njn@valgrind.org>
Date: Mon, 23 Feb 2009 01:33:40 +0000
Subject: [PATCH] A few more test/build changes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9228
---
 drd/tests/Makefile.am                | 4 ++--
 memcheck/tests/amd64/Makefile.am     | 1 +
 memcheck/tests/linux/Makefile.am     | 4 ++++
 memcheck/tests/x86-linux/Makefile.am | 1 +
 memcheck/tests/x86/Makefile.am       | 6 +++---
 none/tests/linux/Makefile.am         | 4 ++++
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 5af780a84d..13e610f06c 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -205,8 +205,6 @@ check_PROGRAMS =      \
   memory_allocation   \
   monitor_example     \
   new_delete          \
-  rwlock_race         \
-  rwlock_test         \
   pth_broadcast       \
   pth_cancel_locked   \
   pth_cond_race       \
@@ -215,6 +213,8 @@ check_PROGRAMS =      \
   pth_detached_sem    \
   pth_inconsistent_cond_wait \
   recursive_mutex     \
+  rwlock_race         \
+  rwlock_test         \
   sem_as_mutex        \
   sigalrm             \
   trylock
diff --git a/memcheck/tests/amd64/Makefile.am b/memcheck/tests/amd64/Makefile.am
index 4f6ca09b36..1f0a111b47 100644
--- a/memcheck/tests/amd64/Makefile.am
+++ b/memcheck/tests/amd64/Makefile.am
@@ -26,6 +26,7 @@ check_PROGRAMS = bt_everything bug132146 defcfaexpr fxsave-amd64 \
 		int3-amd64 \
 		more_x87_fp sse_memory xor-undef-amd64
 
+
 AM_CFLAGS   += @FLAG_M64@
 AM_CXXFLAGS += @FLAG_M64@
 AM_CCASFLAGS = @FLAG_M64@
diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index 82a9e44380..4124c855c8 100644
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -15,5 +15,9 @@ check_PROGRAMS = \
 	stack_switch \
 	timerfd-syscall
 
+
+AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
+
 stack_switch_LDADD    = -lpthread
 timerfd_syscall_LDADD = -lrt
diff --git a/memcheck/tests/x86-linux/Makefile.am b/memcheck/tests/x86-linux/Makefile.am
index 3de0c6c792..7698ffea39 100644
--- a/memcheck/tests/x86-linux/Makefile.am
+++ b/memcheck/tests/x86-linux/Makefile.am
@@ -17,6 +17,7 @@ EXTRA_DIST = $(noinst_SCRIPTS) \
 check_PROGRAMS = \
 	scalar scalar_exit_group scalar_fork scalar_supp scalar_vfork
 
+
 AM_CFLAGS    += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CXXFLAGS  += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
 AM_CCASFLAGS  = @FLAG_M32@
diff --git a/memcheck/tests/x86/Makefile.am b/memcheck/tests/x86/Makefile.am
index b27ffad8bd..09131c88ee 100644
--- a/memcheck/tests/x86/Makefile.am
+++ b/memcheck/tests/x86/Makefile.am
@@ -37,9 +37,9 @@ check_PROGRAMS = \
 	pushpopmem sse_memory tronical \
 	more_x86_fp fprem 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/linux/Makefile.am b/none/tests/linux/Makefile.am
index eeefe526b8..0368ced62e 100644
--- a/none/tests/linux/Makefile.am
+++ b/none/tests/linux/Makefile.am
@@ -12,3 +12,7 @@ check_PROGRAMS = \
 	mremap \
 	mremap2
 
+
+AM_CFLAGS   += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
+
-- 
2.47.3