summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-06 18:55:59 -0800
committerColin Cross <ccross@android.com>2014-02-06 18:55:59 -0800
commit30ee52d8eb45cca10af836e22ee08805f26dd720 (patch)
tree63c6ed0c316a733eee32bee4a609fad85234355e
parentfb7db5853ffb841a4d32fea8b5c3a43e6b875cae (diff)
downloadandroid_external_speex-30ee52d8eb45cca10af836e22ee08805f26dd720.tar.gz
android_external_speex-30ee52d8eb45cca10af836e22ee08805f26dd720.tar.bz2
android_external_speex-30ee52d8eb45cca10af836e22ee08805f26dd720.zip
speex: disable neon for arm64
The neon instructions in libspeex/resample_neon.h fail to compile on arm64: Error: unknown mnemonic `vld1.16' -- `vld1.16 {d16},[x3]!' Error: unknown mnemonic `vld1.16' -- `vld1.16 {d20},[x6]!' Error: unknown mnemonic `vmull.s16' -- `vmull.s16 q0,d16,d20' Error: unknown mnemonic `vld1.16' -- `vld1.16 {d16,d17,d18,d19},[x3]!' Error: unknown mnemonic `vld1.16' -- `vld1.16 {d20,d21,d22,d23},[x6]!' ... Disable neon on arm64 for now. Change-Id: Ifa2a99696241f53b2d6b25c2cb4330b819699a6f
-rw-r--r--Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index d33e184..b63528e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,8 +51,12 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -DEXPORT= -DFIXED_POINT -DRESAMPLE_FORCE_FULL_SINC_TABLE
LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
+ifeq ($(TARGET_ARCH),arm64)
+$(warning TODOArm64: enable neon in libspeex)
+endif
+
ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_CFLAGS += -D_USE_NEON
+LOCAL_CFLAGS_arm += -D_USE_NEON
endif
LOCAL_C_INCLUDES += \