diff options
author | Renato Golin <renato.golin@linaro.org> | 2016-07-13 14:01:15 +0000 |
---|---|---|
committer | Renato Golin <renato.golin@linaro.org> | 2016-07-13 14:01:15 +0000 |
commit | e42331093b119be509dc346b57544d1777d80de4 (patch) | |
tree | bf86fb1253eab5e6e106773cc886f5d793467826 | |
parent | 14f04db1b53e21922728767b440a44741c9e292c (diff) | |
download | compiler-rt-e42331093b119be509dc346b57544d1777d80de4.tar.gz |
[RT-ARM] Syntax unified for aeabi_mem* functions
Use unified syntax for builtins/arm/aeabi_mem*.S.
This makes these files consistent with the others.
This fixes a problem on the linker, which can fail with the message
"relocation truncated to fit: R_ARM_THM_JUMP11 against symbol"
Patch by Kor Nielsen.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@275264 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/builtins/arm/aeabi_memcmp.S | 1 | ||||
-rw-r--r-- | lib/builtins/arm/aeabi_memcpy.S | 1 | ||||
-rw-r--r-- | lib/builtins/arm/aeabi_memset.S | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/builtins/arm/aeabi_memcmp.S b/lib/builtins/arm/aeabi_memcmp.S index 8f49d0689..33ea54848 100644 --- a/lib/builtins/arm/aeabi_memcmp.S +++ b/lib/builtins/arm/aeabi_memcmp.S @@ -11,6 +11,7 @@ // void __aeabi_memcmp(void *dest, void *src, size_t n) { memcmp(dest, src, n); } + .syntax unified .p2align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memcmp) b memcmp diff --git a/lib/builtins/arm/aeabi_memcpy.S b/lib/builtins/arm/aeabi_memcpy.S index bc8486364..eabfa4904 100644 --- a/lib/builtins/arm/aeabi_memcpy.S +++ b/lib/builtins/arm/aeabi_memcpy.S @@ -11,6 +11,7 @@ // void __aeabi_memcpy(void *dest, void *src, size_t n) { memcpy(dest, src, n); } + .syntax unified .p2align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memcpy) b memcpy diff --git a/lib/builtins/arm/aeabi_memset.S b/lib/builtins/arm/aeabi_memset.S index c1d655a55..48edd8970 100644 --- a/lib/builtins/arm/aeabi_memset.S +++ b/lib/builtins/arm/aeabi_memset.S @@ -12,6 +12,7 @@ // void __aeabi_memset(void *dest, size_t n, int c) { memset(dest, c, n); } // void __aeabi_memclr(void *dest, size_t n) { __aeabi_memset(dest, n, 0); } + .syntax unified .p2align 2 DEFINE_COMPILERRT_FUNCTION(__aeabi_memset) mov r3, r1 |