From a661e50bcbe8875ea0d6420bb0699ecf941ddb96 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Fri, 6 Mar 2015 14:48:58 -0800
Subject: [PATCH] Disable NEON code on Native Client

The NEON assember in libwebp has not yet been ported
to Native Client. This changes disables it.
Related issue:
https://code.google.com/p/nativeclient/issues/detail?id=3205

(cherry picked from commit ac4f5784a0a5d64d54f03dcf2e2d133c4b266faa)

Change-Id: I200291db7aa79d40c1f10cff7622c9b8599e6886
---
 src/dsp/dsp.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h
index 52c44b2d..2409bae1 100644
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
@@ -66,7 +66,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