diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-04-24 19:57:28 -0500 |
| commit | 928ab832caa67c0c1a44e3a8e1483b0ed33cda50 (patch) | |
| tree | 6e3df2d0437f834971fe28bdf519a2c8da694fc1 /libc/string/arm/memset.S | |
| parent | 74c69da52ad5029cd2fc2d3d41d581022ed0a7aa (diff) | |
| parent | f1f98784e65ce9621a570af50998b1940e7fb81d (diff) | |
merge uClibc changes
Diffstat (limited to 'libc/string/arm/memset.S')
| -rw-r--r-- | libc/string/arm/memset.S | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libc/string/arm/memset.S b/libc/string/arm/memset.S index 8ddc47eb1..2be4850e4 100644 --- a/libc/string/arm/memset.S +++ b/libc/string/arm/memset.S @@ -17,7 +17,6 @@ <http://www.gnu.org/licenses/>. */ #include <features.h> -#include <sys/syscall.h> #include <bits/arm_asm.h> #include <bits/arm_bx.h> @@ -109,11 +108,7 @@ memset: 2: movs a3, a3 @ anything left? IT(t, eq) -#if defined(__USE_BX__) - bxeq lr -#else - moveq pc, lr @ nope -#endif + BXC(eq, lr) @ nope #if defined (__thumb2__) 1: strb a2, [a4], #1 @@ -131,11 +126,7 @@ memset: strb a2, [a4], $1 strb a2, [a4], $1 strb a2, [a4], $1 -#if defined(__USE_BX__) - bx lr -#else - mov pc, lr -#endif + BX(lr) #endif #endif |