Merge "Disable NEON code on Native Client"

This commit is contained in:
James Zern 2015-03-10 17:52:51 -07:00 committed by Gerrit Code Review
commit 7efb97483f

View File

@ -68,7 +68,10 @@ extern "C" {
#define WEBP_ANDROID_NEON // Android targets that might support NEON
#endif
#if defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || defined(__aarch64__)
// The intrinsics currently cause compiler errors with arm-nacl-gcc and the
// inline assembly would need to be modified for use with Native Client.
#if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \
defined(__aarch64__)) && !defined(__native_client__)
#define WEBP_USE_NEON
#endif