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

Move asm_defines.h to rtc_base/system/

Browse Source 
This moves it from an API directory (system_wrappers/include/) to a
non-API directory, which is exactly what we want for utilities like
this.

Bug: webrtc:8445
NOPRESUBMIT=true

Change-Id: I30d01fcb9cbe1427a7703a3cdd7befae751066b5
Reviewed-on: https://webrtc-review.googlesource.com/21982
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22550}
This commit is contained in:
Karl Wiberg
2018-03-22 02:59:49 +01:00
committed by Commit Bot
parent 1aee625f37
commit 7aabd39b4b
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common_audio/BUILD.gn
View File

@ -131,7 +131,7 @@ rtc_source_set("common_audio_c_arm_asm") {
} else {
sources += [ "signal_processing/filter_ar_fast_q12.c" ]
}
deps += [ "../system_wrappers:asm_defines" ]
deps += [ "../rtc_base/system:asm_defines" ]
}
}

2
common_audio/signal_processing/complex_bit_reverse_arm.S
View File

@ -12,7 +12,7 @@
@ for ARMv5 platforms.
@ Reference C code is in file complex_bit_reverse.c. Bit-exact.
#include "system_wrappers/include/asm_defines.h"
#include "rtc_base/system/asm_defines.h"
GLOBAL_FUNCTION WebRtcSpl_ComplexBitReverse
.align 2

2
common_audio/signal_processing/filter_ar_fast_q12_armv7.S
View File

@ -35,7 +35,7 @@
@ r11: Scratch
@ r12: &coefficients[j]
#include "system_wrappers/include/asm_defines.h"
#include "rtc_base/system/asm_defines.h"
GLOBAL_FUNCTION WebRtcSpl_FilterARFastQ12
.align 2

2
common_audio/signal_processing/spl_sqrt_floor_arm.S
View File

@ -32,7 +32,7 @@
@ Output: r0 = INT (SQRT (r0)), precision is 16 bits
@ Registers touched: r1, r2
#include "system_wrappers/include/asm_defines.h"
#include "rtc_base/system/asm_defines.h"
GLOBAL_FUNCTION WebRtcSpl_SqrtFloor
.align 2

2
modules/audio_coding/BUILD.gn
View File

@ -652,7 +652,7 @@ rtc_source_set("isac_fix_c_arm_asm") {
]
deps = [
":isac_fix_common",
"../../system_wrappers:asm_defines",
"../../rtc_base/system:asm_defines",
]
}
}

2
modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S
View File

@ -25,8 +25,8 @@
@ r12: constant #16384
@ r6, r7, r8, r10, r11: scratch
#include "system_wrappers/include/asm_defines.h"
#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
#include "rtc_base/system/asm_defines.h"
GLOBAL_FUNCTION WebRtcIsacfix_FilterArLoop
.align 2

2
modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S
View File

@ -13,8 +13,8 @@
@
@ Output is bit-exact with the reference C code in pitch_filter.c.
#include "system_wrappers/include/asm_defines.h"
#include "modules/audio_coding/codecs/isac/fix/source/settings.h"
#include "rtc_base/system/asm_defines.h"
GLOBAL_FUNCTION WebRtcIsacfix_PitchFilterCore
.align 2

6
rtc_base/system/BUILD.gn
View File

@ -12,6 +12,12 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
rtc_source_set("asm_defines") {
sources = [
"asm_defines.h",
]
}
rtc_source_set("fallthrough") {
sources = [
"fallthrough.h",

6
system_wrappers/include/asm_defines.h → rtc_base/system/asm_defines.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_
#define SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_
#ifndef RTC_BASE_SYSTEM_ASM_DEFINES_H_
#define RTC_BASE_SYSTEM_ASM_DEFINES_H_
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits
@ -63,4 +63,4 @@ strheq \reg1, \reg2, \num
.text
#endif // SYSTEM_WRAPPERS_INCLUDE_ASM_DEFINES_H_
#endif // RTC_BASE_SYSTEM_ASM_DEFINES_H_

6
system_wrappers/BUILD.gn
View File

@ -124,12 +124,6 @@ rtc_source_set("cpu_features_api") {
]
}
rtc_source_set("asm_defines") {
sources = [
"include/asm_defines.h",
]
}
rtc_source_set("field_trial_api") {
sources = [
"include/field_trial.h",