A few more test/build changes.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 5af780a84d3119cfef6c87160e58ad1a581f7051..13e610f06c9d104f028bd312bef1d24fc046cc4a 100644 (file)
--- 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 4f6ca09b362c821025a9fb2bae8a38eaf8089528..1f0a111b478d9b5f7bf3dacb92c770634eac2f01 100644 (file)
--- 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 82a9e443800a815df64e5d09674fc1a5405ff119..4124c855c8302c7d9c952fca3fa8acee373ced93 100644 (file)
--- 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 3de0c6c792672a21de9c5f5f00b230a60ca74366..7698ffea393d6117c4cdd42e88126044934b000c 100644 (file)
--- 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 b27ffad8bd80b84c256f8789ba71e34d1f31819e..09131c88eeba234f02dd846d42fc1e0fb0a34429 100644 (file)
--- 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 eeefe526b8e77798454a49f955483ebc528251da..0368ced62e72cf2ac64c81be1965bfb78c54eda4 100644 (file)
--- 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)
+