search for: 6018bda

...* correct! Signed-off-by: Steve McIntyre <steve at einval.com> Signed-off-by: maximilian attems <max at stro.at> --- usr/klibc/arch/arm/setjmp.S | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/usr/klibc/arch/arm/setjmp.S b/usr/klibc/arch/arm/setjmp.S index 6018bda..d351e0e 100644 --- a/usr/klibc/arch/arm/setjmp.S +++ b/usr/klibc/arch/arm/setjmp.S @@ -41,7 +41,9 @@ setjmp: longjmp: ldmia r0, {r4, r5, r6, r7, r8, r9, r10, fp, sp, lr} mov r0, r1 - BX(lr) + bne 1f + mov r0, #1 +1: BX(lr) .size longjmp,.-longjmp #else /* __thumb__ */

..._SYS_SOCKETCALL 0 #endif +/* + * _KLIBC_ARM_USE_BX + * + * This arm architecture supports bx instruction. + */ +#ifndef _KLIBC_ARM_USE_BX +# define _KLIBC_ARM_USE_BX 0 +#endif + #endif /* _KLIBC_SYSCONFIG_H */ diff --git a/usr/klibc/arch/arm/setjmp.S b/usr/klibc/arch/arm/setjmp.S index 2232458..6018bda 100644 --- a/usr/klibc/arch/arm/setjmp.S +++ b/usr/klibc/arch/arm/setjmp.S @@ -4,6 +4,8 @@ # setjmp/longjmp for the ARM architecture # +#include <klibc/asmmacros.h> + #ifndef __thumb__ # @@ -29,7 +31,7 @@ setjmp: stmia r0, {r4, r5, r6, r7, r8, r9, r10, fp, sp, lr} mov r0, #0 - mo...