Bumping manifests a=b2g-bump
[gecko.git] / media / libvpx / apple-clang.patch
blob549ff0d2e8497f5f1ad39e0bf03b05e9c631926f
1 diff --git a/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c b/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
2 --- a/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
3 +++ b/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
4 @@ -27,21 +27,24 @@ DECLARE_ALIGNED(32, static const uint8_t
5 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12
6 };
8 DECLARE_ALIGNED(32, static const uint8_t, filt4_global_avx2[32]) = {
9 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14,
10 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14
13 #if defined(__clang__)
14 # if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \
15 - (defined(__APPLE__) && __clang_major__ == 5 && __clang_minor__ == 0)
16 + (defined(__APPLE__) && \
17 + (__clang_major__ == 4 && __clang_minor__ >= 0 && \
18 + __clang_minor__ <= 2) || \
19 + (__clang_major__ == 5 && __clang_minor__ == 0))
20 # define MM256_BROADCASTSI128_SI256(x) \
21 _mm_broadcastsi128_si256((__m128i const *)&(x))
22 # else // clang > 3.3, and not 5.0 on macosx.
23 # define MM256_BROADCASTSI128_SI256(x) _mm256_broadcastsi128_si256(x)
24 # endif // clang <= 3.3
25 #elif defined(__GNUC__)
26 # if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 6)
27 # define MM256_BROADCASTSI128_SI256(x) \
28 _mm_broadcastsi128_si256((__m128i const *)&(x))
29 # elif __GNUC__ == 4 && __GNUC_MINOR__ == 7