summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2015-01-15 23:04:08 -0800
committerJames Zern <jzern@google.com>2015-03-03 17:53:42 -0800
commit39aa0555290633bc1120937896bbb386013c6ba4 (patch)
tree26809117cf171ac8cf442b8e60a468395e4b4171
parentf814f429ca46fb226df98c9ec3d0e1558384180b (diff)
downloadlibwebp-39aa0555290633bc1120937896bbb386013c6ba4.tar.gz
dsp/cpu: (msvs) avoid immintrin.h on _M_ARM
_xgetgv() isn't relevant there anyway broken since: 279e661 Merge "dsp/cpu: add include for _xgetbv() w/MSVS" (cherry picked from commit 4fbe9cf2028230c78c83d7b0e8b3d361b8482e71) Change-Id: Iaa7bc0c5be9c06bfffab39e194c64c09bf5b5a27
-rw-r--r--src/dsp/cpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dsp/cpu.c b/src/dsp/cpu.c
index 731c5936..7673d0fa 100644
--- a/src/dsp/cpu.c
+++ b/src/dsp/cpu.c
@@ -55,7 +55,8 @@ static WEBP_INLINE uint64_t xgetbv(void) {
: "=a"(eax), "=d"(edx) : "c" (ecx));
return ((uint64_t)edx << 32) | eax;
}
-#elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 160040219 // >= VS2010 SP1
+#elif (defined(_M_X64) || defined(_M_IX86)) && \
+ defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 160040219 // >= VS2010 SP1
#include <immintrin.h>
#define xgetbv() _xgetbv(0)
#elif defined(_MSC_VER) && defined(_M_IX86)