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
This commit is contained in:
Stephen Hines
2015-08-14 14:57:46 -07:00
parent c7d448429f
commit e9307697c8
2 changed files with 1 additions and 4 deletions

View File

@ -67,13 +67,12 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := aecm_core_neon.c LOCAL_SRC_FILES := aecm_core_neon.c
# Assembly code in aecm_core_neon.c does not compile with Clang. # Assembly code in aecm_core_neon.c does not compile with Clang.
# BUG: 17820427
LOCAL_CLANG_CFLAGS_arm += -no-integrated-as LOCAL_CLANG_CFLAGS_arm += -no-integrated-as
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS) \ $(MY_WEBRTC_COMMON_DEFS) \
-mfpu=neon \
-mfloat-abi=softfp \
-flax-vector-conversions -flax-vector-conversions
LOCAL_MODULE_TARGET_ARCH := arm LOCAL_MODULE_TARGET_ARCH := arm

View File

@ -72,8 +72,6 @@ LOCAL_SRC_FILES := nsx_core_neon.c
# Flags passed to both C and C++ files. # Flags passed to both C and C++ files.
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \
$(MY_WEBRTC_COMMON_DEFS) \ $(MY_WEBRTC_COMMON_DEFS) \
-mfpu=neon \
-mfloat-abi=softfp \
-flax-vector-conversions -flax-vector-conversions
LOCAL_MODULE_TARGET_ARCH := arm LOCAL_MODULE_TARGET_ARCH := arm