From 9303b941d86a30e653bab2769ecfae7f1cc24f26 Mon Sep 17 00:00:00 2001 From: James Zern Date: Thu, 15 Sep 2016 20:40:21 -0700 Subject: [PATCH] aom_subpixel_8t_intrin_avx2: tolerate unversioned clang assume __clang_major__==0 has the latest version of _mm256_broadcastsi128_si256. fixes builds with custom clang toolchains. cherry-picked from libvpx: 33aef48f2 vpx_subpixel_8t_intrin_avx2: tolerate unversioned clang BUG=b/30970831 Change-Id: I90becd56278e4716bd46e2ba9d910af977e8dfa6 --- aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c b/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c index 1449dd866..61476b8be 100644 --- a/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c +++ b/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c @@ -37,11 +37,11 @@ DECLARE_ALIGNED(32, static const uint8_t, filt4_global_avx2[32]) = { }; #if defined(__clang__) -#if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \ - (defined(__APPLE__) && defined(__apple_build_version__) && \ - ((__clang_major__ == 4 && __clang_minor__ <= 2) || \ +#if (__clang_major__ > 0 && __clang_major__ < 3) || \ + (__clang_major__ == 3 && __clang_minor__ <= 3) || \ + (defined(__APPLE__) && defined(__apple_build_version__) && \ + ((__clang_major__ == 4 && __clang_minor__ <= 2) || \ (__clang_major__ == 5 && __clang_minor__ == 0))) - #define MM256_BROADCASTSI128_SI256(x) \ _mm_broadcastsi128_si256((__m128i const *)&(x)) #else // clang > 3.3, and not 5.0 on macosx. -- GitLab