Complete fix for bz#344416 - Fix make regtest does not work cleanly on OS X (3).
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15442 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/NEWS b/NEWS
index b21a77e..70dcb5a 100644
--- a/NEWS
+++ b/NEWS
@@ -198,6 +198,7 @@
344314 callgrind_annotate ... warnings about commands containing newlines
344318 socketcall should wrap recvmmsg and sendmmsg
344337 Fix unhandled syscall: mach:41 (_kernelrpc_mach_port_guard_trap)
+344416 Fix ’make regtest' does not work cleanly on OS X
344499 Fix compilation for Linux kernel >= 4. With this, also require
a Linux kernel >= 2.6 as 2.4 is mostly untested and might trigger
obvious and non-obvious issues
diff --git a/docs/internals/3_10_BUGSTATUS.txt b/docs/internals/3_10_BUGSTATUS.txt
index 55b3d2b..0dcf47f 100644
--- a/docs/internals/3_10_BUGSTATUS.txt
+++ b/docs/internals/3_10_BUGSTATUS.txt
@@ -329,7 +329,6 @@
leak regardless of the simplicity of the program.
344416 'make regtest' does not work cleanly on OS X
- meta-bug
348565 unknown warning options on clang/osx:
Wmissing-parameter-type Wold-style-declaration
diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index 4d2bcbd..53acc50 100644
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -116,16 +116,6 @@
pcmpstr64 pcmpxstrx64 sse4-64 crc32 aes \
pcmpstr64w pcmpxstrx64w
endif
-if BUILD_AVX_TESTS
-if BUILD_VPCLMULQDQ_TESTS
- check_PROGRAMS += avx-1
-endif
-endif
-if BUILD_AVX2_TESTS
-if !COMPILER_IS_ICC
- check_PROGRAMS += avx2-1
-endif
-endif
if BUILD_TSX_TESTS
check_PROGRAMS += tm1 xacq_xrel
endif
@@ -157,6 +147,16 @@
if BUILD_MOVBE_TESTS
check_PROGRAMS += movbe
endif
+if BUILD_AVX_TESTS
+if BUILD_VPCLMULQDQ_TESTS
+ check_PROGRAMS += avx-1
+endif
+endif
+if BUILD_AVX2_TESTS
+if !COMPILER_IS_ICC
+ check_PROGRAMS += avx2-1
+endif
+endif
endif
AM_CFLAGS += @FLAG_M64@