summaryrefslogtreecommitdiff
path: root/libc/string/arm/strlen.S
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-04-24 19:57:28 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-24 19:57:28 -0500
commit928ab832caa67c0c1a44e3a8e1483b0ed33cda50 (patch)
tree6e3df2d0437f834971fe28bdf519a2c8da694fc1 /libc/string/arm/strlen.S
parent74c69da52ad5029cd2fc2d3d41d581022ed0a7aa (diff)
parentf1f98784e65ce9621a570af50998b1940e7fb81d (diff)
merge uClibc changes
Diffstat (limited to 'libc/string/arm/strlen.S')
-rw-r--r--libc/string/arm/strlen.S7
1 files changed, 1 insertions, 6 deletions
diff --git a/libc/string/arm/strlen.S b/libc/string/arm/strlen.S
index 0e7737e23..9995d768c 100644
--- a/libc/string/arm/strlen.S
+++ b/libc/string/arm/strlen.S
@@ -18,7 +18,6 @@
#include <features.h>
#include <endian.h>
-#include <sys/syscall.h>
#include <bits/arm_asm.h>
#include <bits/arm_bx.h>
@@ -99,11 +98,7 @@ Llastword: @ drop through to here once we find a
IT(t, ne)
addne r0, r0, $1 @ must be zero)
#endif
-#if defined(__USE_BX__)
- bx lr
-#else
- mov pc,lr
-#endif
+ BX(lr)
#endif
.size strlen,.-strlen