| Index: source/libvpx/third_party/libyuv/source/compare_win.cc
|
| diff --git a/source/libvpx/third_party/libyuv/source/compare_win.cc b/source/libvpx/third_party/libyuv/source/compare_win.cc
|
| index e99009a21dff24c63f341f9ef3344068feffaeb0..19806f275095391d480282416040d981471a258b 100644
|
| --- a/source/libvpx/third_party/libyuv/source/compare_win.cc
|
| +++ b/source/libvpx/third_party/libyuv/source/compare_win.cc
|
| @@ -16,9 +16,11 @@ namespace libyuv {
|
| extern "C" {
|
| #endif
|
|
|
| -#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER)
|
| +// This module is for Visual C x86.
|
| +#if !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && \
|
| + defined(_MSC_VER) && !defined(__clang__)
|
|
|
| -__declspec(naked) __declspec(align(16))
|
| +__declspec(naked)
|
| uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) {
|
| __asm {
|
| mov eax, [esp + 4] // src_a
|
| @@ -59,7 +61,7 @@ uint32 SumSquareError_SSE2(const uint8* src_a, const uint8* src_b, int count) {
|
| #if _MSC_VER >= 1700
|
| // C4752: found Intel(R) Advanced Vector Extensions; consider using /arch:AVX.
|
| #pragma warning(disable: 4752)
|
| -__declspec(naked) __declspec(align(16))
|
| +__declspec(naked)
|
| uint32 SumSquareError_AVX2(const uint8* src_a, const uint8* src_b, int count) {
|
| __asm {
|
| mov eax, [esp + 4] // src_a
|
| @@ -133,7 +135,7 @@ static uvec32 kHashMul3 = {
|
| #define pmulld(reg) _asm _emit 0x66 _asm _emit 0x0F _asm _emit 0x38 \
|
| _asm _emit 0x40 _asm _emit reg
|
|
|
| -__declspec(naked) __declspec(align(16))
|
| +__declspec(naked)
|
| uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) {
|
| __asm {
|
| mov eax, [esp + 4] // src
|
| @@ -184,7 +186,7 @@ uint32 HashDjb2_SSE41(const uint8* src, int count, uint32 seed) {
|
|
|
| // Visual C 2012 required for AVX2.
|
| #if _MSC_VER >= 1700
|
| -__declspec(naked) __declspec(align(16))
|
| +__declspec(naked)
|
| uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed) {
|
| __asm {
|
| mov eax, [esp + 4] // src
|
| @@ -219,8 +221,7 @@ uint32 HashDjb2_AVX2(const uint8* src, int count, uint32 seed) {
|
| }
|
| }
|
| #endif // _MSC_VER >= 1700
|
| -
|
| -#endif // !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86) && defined(_MSC_VER)
|
| +#endif // !defined(LIBYUV_DISABLE_X86) && defined(_M_IX86)
|
|
|
| #ifdef __cplusplus
|
| } // extern "C"
|
|
|