aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-02-19 20:40:17 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2017-07-17 19:20:00 +0300
commit2181d8f2abc977fa12ed72d9bd8369db9370dae8 (patch)
treebd9b1f60a47374256583be1fc56a763574f0c62c
parent181510bd6eb767361da5e02e41be08cc65b36b08 (diff)
downloadmeson-2181d8f2abc977fa12ed72d9bd8369db9370dae8.zip
meson-2181d8f2abc977fa12ed72d9bd8369db9370dae8.tar.gz
meson-2181d8f2abc977fa12ed72d9bd8369db9370dae8.tar.bz2
A few fixes for OSX and VS2010.
-rw-r--r--test cases/common/139 simd/meson.build4
-rw-r--r--test cases/common/139 simd/simd_ssse3.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/test cases/common/139 simd/meson.build b/test cases/common/139 simd/meson.build
index e62cc44..26a291b 100644
--- a/test cases/common/139 simd/meson.build
+++ b/test cases/common/139 simd/meson.build
@@ -12,6 +12,10 @@ if not meson.is_cross_build() and host_machine.cpu_family() == 'arm' and cc.get_
add_project_arguments('-march=armv7', language : 'c')
endif
+if cc.get_id() == 'msvc' and version_compare(cc.version(), '<17')
+ error('MESON_SKIP_TEST VS2010 produces broken binaries on x86.')
+endif
+
simdlibs = simd.check('mysimds',
mmx : 'simd_mmx.c',
sse : 'simd_sse.c',
diff --git a/test cases/common/139 simd/simd_ssse3.c b/test cases/common/139 simd/simd_ssse3.c
index 40443be..ab4dff4 100644
--- a/test cases/common/139 simd/simd_ssse3.c
+++ b/test cases/common/139 simd/simd_ssse3.c
@@ -19,6 +19,9 @@ int ssse3_available() {
int ssse3_available() {
#ifdef __APPLE__
return 1;
+#elif defined(__clang__)
+ /* https://github.com/numpy/numpy/issues/8130 */
+ return __builtin_cpu_supports("sse4.1");
#else
return __builtin_cpu_supports("ssse3");
#endif