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/sysdeps/linux/arm/sysdep.h | |
| parent | 74c69da52ad5029cd2fc2d3d41d581022ed0a7aa (diff) | |
| parent | f1f98784e65ce9621a570af50998b1940e7fb81d (diff) | |
merge uClibc changes
Diffstat (limited to 'libc/sysdeps/linux/arm/sysdep.h')
| -rw-r--r-- | libc/sysdeps/linux/arm/sysdep.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h index 2d0a9cc41..7f1e9c1a9 100644 --- a/libc/sysdeps/linux/arm/sysdep.h +++ b/libc/sysdeps/linux/arm/sysdep.h @@ -21,7 +21,6 @@ #include <common/sysdep.h> #include <bits/arm_bx.h> - #include <sys/syscall.h> /* For Linux we can use the system call table in the header file /usr/include/asm/unistd.h @@ -50,17 +49,10 @@ #ifdef __APCS_32__ #define LOADREGS(cond, base, reglist...)\ ldm##cond base,reglist -#ifdef __USE_BX__ -#define RETINSTR(cond, reg) \ - bx##cond reg -#define DO_RET(_reg) \ - bx _reg -#else -#define RETINSTR(cond, reg) \ - mov##cond pc, reg +#define RETINSTR(cond, reg) \ + BXC(cond, reg) #define DO_RET(_reg) \ - mov pc, _reg -#endif + BX(_reg) #else /* APCS-26 */ #define LOADREGS(cond, base, reglist...) \ ldm##cond base,reglist^ |