From 7aabd39b4bea18213495246d59c4e5e0f85b5966 Mon Sep 17 00:00:00 2001 From: Karl Wiberg Date: Thu, 22 Mar 2018 02:59:49 +0100 Subject: [PATCH] Move asm_defines.h to rtc_base/system/ 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 Reviewed-by: Henrik Lundin Cr-Commit-Position: refs/heads/master@{#22550} --- common_audio/BUILD.gn | 2 +- common_audio/signal_processing/complex_bit_reverse_arm.S | 2 +- common_audio/signal_processing/filter_ar_fast_q12_armv7.S | 2 +- common_audio/signal_processing/spl_sqrt_floor_arm.S | 2 +- modules/audio_coding/BUILD.gn | 2 +- modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S | 2 +- .../codecs/isac/fix/source/pitch_filter_armv6.S | 2 +- rtc_base/system/BUILD.gn | 6 ++++++ {system_wrappers/include => rtc_base/system}/asm_defines.h | 6 +++--- system_wrappers/BUILD.gn | 6 ------ 10 files changed, 16 insertions(+), 16 deletions(-) rename {system_wrappers/include => rtc_base/system}/asm_defines.h (91%) diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn index 13b1e5588e..1a3615b944 100644 --- a/common_audio/BUILD.gn +++ b/common_audio/BUILD.gn @@ -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" ] } } diff --git a/common_audio/signal_processing/complex_bit_reverse_arm.S b/common_audio/signal_processing/complex_bit_reverse_arm.S index c70349aaff..be8e181aa7 100644 --- a/common_audio/signal_processing/complex_bit_reverse_arm.S +++ b/common_audio/signal_processing/complex_bit_reverse_arm.S @@ -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 diff --git a/common_audio/signal_processing/filter_ar_fast_q12_armv7.S b/common_audio/signal_processing/filter_ar_fast_q12_armv7.S index c6397c2055..60319d29ff 100644 --- a/common_audio/signal_processing/filter_ar_fast_q12_armv7.S +++ b/common_audio/signal_processing/filter_ar_fast_q12_armv7.S @@ -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 diff --git a/common_audio/signal_processing/spl_sqrt_floor_arm.S b/common_audio/signal_processing/spl_sqrt_floor_arm.S index 29e6d4d455..228e68e6ca 100644 --- a/common_audio/signal_processing/spl_sqrt_floor_arm.S +++ b/common_audio/signal_processing/spl_sqrt_floor_arm.S @@ -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 diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn index c20bd2bcc7..129529408c 100644 --- a/modules/audio_coding/BUILD.gn +++ b/modules/audio_coding/BUILD.gn @@ -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", ] } } diff --git a/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S b/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S index 67ca4a40ff..4c63227d7d 100644 --- a/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S +++ b/modules/audio_coding/codecs/isac/fix/source/lattice_armv7.S @@ -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 diff --git a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S index d5b55418dc..065946856f 100644 --- a/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S +++ b/modules/audio_coding/codecs/isac/fix/source/pitch_filter_armv6.S @@ -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 diff --git a/rtc_base/system/BUILD.gn b/rtc_base/system/BUILD.gn index 23d802acbc..05891b92dd 100644 --- a/rtc_base/system/BUILD.gn +++ b/rtc_base/system/BUILD.gn @@ -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", diff --git a/system_wrappers/include/asm_defines.h b/rtc_base/system/asm_defines.h similarity index 91% rename from system_wrappers/include/asm_defines.h rename to rtc_base/system/asm_defines.h index 7f4c80ef2c..e1c7453a9c 100644 --- a/system_wrappers/include/asm_defines.h +++ b/rtc_base/system/asm_defines.h @@ -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_ diff --git a/system_wrappers/BUILD.gn b/system_wrappers/BUILD.gn index 93549fdf45..271cc2c8aa 100644 --- a/system_wrappers/BUILD.gn +++ b/system_wrappers/BUILD.gn @@ -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",