From e9307697c8190393df144d7441396e75662a45e0 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 14 Aug 2015 14:57:46 -0700 Subject: [PATCH] Remove unnecessary neon flags and update a missing comment. -mfpu=neon collides when we have improved flags like -mfpu=neon-vfpv4 (that can be used with krait CPUs). The prior -no-integrated-as change (which exposes this bug) was also missing a BUG: link in the Android.mk itself. Change-Id: I808144d4560ca579749af2aa1372f3d599890308 --- src/modules/audio_processing/aecm/Android.mk | 3 +-- src/modules/audio_processing/ns/Android.mk | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/modules/audio_processing/aecm/Android.mk b/src/modules/audio_processing/aecm/Android.mk index d99bbd95b9..59c1b20638 100644 --- a/src/modules/audio_processing/aecm/Android.mk +++ b/src/modules/audio_processing/aecm/Android.mk @@ -67,13 +67,12 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := aecm_core_neon.c # Assembly code in aecm_core_neon.c does not compile with Clang. +# BUG: 17820427 LOCAL_CLANG_CFLAGS_arm += -no-integrated-as # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) \ - -mfpu=neon \ - -mfloat-abi=softfp \ -flax-vector-conversions LOCAL_MODULE_TARGET_ARCH := arm diff --git a/src/modules/audio_processing/ns/Android.mk b/src/modules/audio_processing/ns/Android.mk index 9a4badf614..966bcaf5f1 100644 --- a/src/modules/audio_processing/ns/Android.mk +++ b/src/modules/audio_processing/ns/Android.mk @@ -72,8 +72,6 @@ LOCAL_SRC_FILES := nsx_core_neon.c # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ $(MY_WEBRTC_COMMON_DEFS) \ - -mfpu=neon \ - -mfloat-abi=softfp \ -flax-vector-conversions LOCAL_MODULE_TARGET_ARCH := arm