From e003dfb3b37a3d616a2b0a29836a26d6d1210f23 Mon Sep 17 00:00:00 2001 From: Rhys Kidd Date: Thu, 23 Jul 2015 05:04:36 +0000 Subject: [PATCH] Partial fix for bz#344416 - Fix make regtest does not work cleanly on OS X. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15440 --- none/tests/amd64/Makefile.am | 6 +++--- none/tests/x86/Makefile.am | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am index 7e943abe45..4d2bcbd252 100644 --- a/none/tests/amd64/Makefile.am +++ b/none/tests/amd64/Makefile.am @@ -135,9 +135,6 @@ endif if BUILD_FMA_TESTS check_PROGRAMS += fma endif -if BUILD_MOVBE_TESTS - check_PROGRAMS += movbe -endif if BUILD_MPX_TESTS check_PROGRAMS += mpx endif @@ -157,6 +154,9 @@ if ! VGCONF_OS_IS_DARWIN if BUILD_LOOPNEL_TESTS check_PROGRAMS += loopnel endif +if BUILD_MOVBE_TESTS + check_PROGRAMS += movbe +endif endif AM_CFLAGS += @FLAG_M64@ diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am index f9632efb52..82ac3f9d54 100644 --- a/none/tests/x86/Makefile.am +++ b/none/tests/x86/Makefile.am @@ -111,14 +111,14 @@ if BUILD_LZCNT_TESTS check_PROGRAMS += lzcnt32 endif if !VGCONF_OS_IS_DARWIN +if BUILD_MOVBE_TESTS + check_PROGRAMS += movbe +endif if !SOLARIS_SUN_STUDIO_AS # Sun Studio assembler fails to assemble the bound instruction check_PROGRAMS += faultstatus endif endif -if BUILD_MOVBE_TESTS - check_PROGRAMS += movbe -endif if !SOLARIS_SUN_STUDIO_AS # Sun Studio assembler fails to assemble pushw %fs, popw %fs check_PROGRAMS += pushpopseg -- 2.47.2