From: Rhys Kidd <rhyskidd@gmail.com>
Date: Thu, 23 Jul 2015 05:33:31 +0000 (+0000)
Subject: Partial fix for bz#344416 - Fix make regtest does not work cleanly on OS X (2).
X-Git-Tag: svn/VALGRIND_3_11_0~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bd4c0d953ff7b0e9e062ebc98e1180912a672b6;p=thirdparty%2Fvalgrind.git

Partial fix for bz#344416 - Fix make regtest does not work cleanly on OS X (2).

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

diff --git a/none/tests/x86/Makefile.am b/none/tests/x86/Makefile.am
index 82ac3f9d54..0113a0b61b 100644
--- a/none/tests/x86/Makefile.am
+++ b/none/tests/x86/Makefile.am
@@ -5,18 +5,25 @@ dist_noinst_SCRIPTS = filter_cpuid filter_inf_nan filter_stderr gen_insn_test.pl
 
 CLEANFILES = $(addsuffix .c,$(INSN_TESTS))
 
-INSN_TESTS = insn_basic insn_cmov insn_mmx insn_mmxext \
-		insn_sse insn_sse2
+INSN_TESTS = insn_basic insn_cmov insn_mmx insn_mmxext
+
+if !COMPILER_IS_CLANG
+   INSN_TESTS += insn_sse insn_sse2
 if BUILD_SSSE3_TESTS
    INSN_TESTS += insn_ssse3
 endif
+if BUILD_SSE3_TESTS
 if !SOLARIS_SUN_STUDIO_AS
 # Sun Studio assembler fails to build some tests (illegal mnemonic).
-INSN_TESTS += insn_fpu
-if BUILD_SSE3_TESTS
    INSN_TESTS += insn_sse3
 endif
 endif
+endif
+
+if !SOLARIS_SUN_STUDIO_AS
+# Sun Studio assembler fails to build some tests (illegal mnemonic).
+   INSN_TESTS += insn_fpu
+endif
 
 # Explicitly include insn_sse3 even if ! BUILD_SSE3_TESTS, 
 # to avoid packaging screwups if 'make dist' is run on a machine