New upstream version 1.25.0+dfsg1

[rustc.git] / src / libcompiler_builtins / compiler-rt / lib / builtins / arm / aeabi_memset.S

diff --git a/src/libcompiler_builtins/compiler-rt/lib/builtins/arm/aeabi_memset.S b/src/libcompiler_builtins/compiler-rt/lib/builtins/arm/aeabi_memset.S
index 48edd89705be6dad541e061a6580315c6b08a3d8..0a678d7627e7baddd284694b3696804d41925738 100644 (file)
--- a/src/libcompiler_builtins/compiler-rt/lib/builtins/arm/aeabi_memset.S
+++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/arm/aeabi_memset.S
@@ -18,16 +18,29 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_memset)
         mov     r3, r1
         mov     r1, r2
         mov     r2, r3
+#ifdef USE_THUMB_1
+        push    {r7, lr}
+        bl      memset
+        pop     {r7, pc}
+#else
         b       memset
+#endif
 END_COMPILERRT_FUNCTION(__aeabi_memset)
 
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memset4, __aeabi_memset)
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memset8, __aeabi_memset)
 
+        .p2align 2
 DEFINE_COMPILERRT_FUNCTION(__aeabi_memclr)
         mov     r2, r1
-        mov     r1, #0
+        movs    r1, #0
+#ifdef USE_THUMB_1
+        push    {r7, lr}
+        bl      memset
+        pop     {r7, pc}
+#else
         b       memset
+#endif
 END_COMPILERRT_FUNCTION(__aeabi_memclr)
 
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_memclr4, __aeabi_memclr)