zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly add -mfpu=neon to all targets that use NEON

Browse Source 
Remove obsolete comment about Chromium not defining NEON for Android.

Semi-related fix: don't use `rtc_remove_configs` directly, `suppressed_configs` is the "public interface".

Bug: webrtc:9579
Change-Id: I512628feb462a29432f1356cfef00efe1ddaf84f
Reviewed-on: https://webrtc-review.googlesource.com/91761
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Oleh Prypin <oprypin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24165}
This commit is contained in:
Oleh Prypin
2018-08-01 12:18:05 +02:00
committed by Commit Bot
parent 7a1c7f782a
commit d2f4e8bd90
9 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -330,7 +330,7 @@ if (!build_with_chromium) {
sources = []
complete_static_lib = true
rtc_remove_configs = [ "//build/config/compiler:thin_archive" ]
suppressed_configs += [ "//build/config/compiler:thin_archive" ]
defines = []
deps = [

8
common_audio/BUILD.gn
View File

@ -290,9 +290,7 @@ if (rtc_build_with_neon) {
]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}
@ -325,9 +323,7 @@ if (rtc_build_with_neon) {
]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}

11
modules/audio_coding/BUILD.gn
View File

@ -686,6 +686,13 @@ rtc_source_set("isac_fix_c") {
if (rtc_build_with_neon) {
deps += [ ":isac_neon" ]
# TODO(bugs.webrtc.org/9579): Consider moving the usage of NEON from
# pitch_estimator_c.c into the "isac_neon" target and delete this flag:
if (current_cpu != "arm64") {
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}
}
if (current_cpu == "arm" && arm_version >= 7) {
@ -733,9 +740,7 @@ if (rtc_build_with_neon) {
]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}

4
modules/audio_processing/BUILD.gn
View File

@ -271,9 +271,7 @@ rtc_source_set("audio_processing_c") {
sources += [ "ns/nsx_core_neon.c" ]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}

4
modules/audio_processing/aec/BUILD.gn
View File

@ -58,9 +58,7 @@ rtc_source_set("aec_core") {
sources += [ "aec_core_neon.cc" ]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags += [ "-mfpu=neon" ]
}

5
modules/audio_processing/aec3/BUILD.gn
View File

@ -116,6 +116,11 @@ rtc_static_library("aec3") {
]
defines = []
if (rtc_build_with_neon && current_cpu != "arm64") {
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}
deps = [
"..:apm_logging",
"..:audio_processing",

4
modules/audio_processing/aecm/BUILD.gn
View File

@ -30,9 +30,7 @@ rtc_source_set("aecm_core") {
sources += [ "aecm_core_neon.cc" ]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags += [ "-mfpu=neon" ]
}

4
modules/audio_processing/agc/BUILD.gn
View File

@ -75,9 +75,7 @@ rtc_source_set("agc_legacy_c") {
if (rtc_build_with_neon) {
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags = [ "-mfpu=neon" ]
}

4
modules/audio_processing/utility/BUILD.gn
View File

@ -63,9 +63,7 @@ rtc_source_set("ooura_fft") {
deps += [ "../../../common_audio" ]
if (current_cpu != "arm64") {
# Enable compilation for the NEON instruction set. This is needed
# since //build/config/arm.gni only enables NEON for iOS, not Android.
# This provides the same functionality as webrtc/build/arm_neon.gypi.
# Enable compilation for the NEON instruction set.
suppressed_configs += [ "//build/config/compiler:compiler_arm_fpu" ]
cflags += [ "-mfpu=neon" ]
}