shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Fix avx builds on macosx with clang 5.0."

--- a/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c

+++ b/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c

@@ -33,10 +33,11 @@

 };

 #if defined(__clang__)

-# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3)

+# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \

+      (defined(__APPLE__) && __clang_major__ == 5 && __clang_minor__ == 0)

 #  define MM256_BROADCASTSI128_SI256(x) \

        _mm_broadcastsi128_si256((__m128i const *)&(x))

-# else  // clang > 3.3

+# else  // clang > 3.3, and not 5.0 on macosx.

 #  define MM256_BROADCASTSI128_SI256(x) _mm256_broadcastsi128_si256(x)

 # endif  // clang <= 3.3

 #elif defined(__GNUC__)