Don't run floating point opcodes when code is compiled -msoft-float

 -Erik

diff --git a/libc/sysdeps/linux/arm/__longjmp.S b/libc/sysdeps/linux/arm/__longjmp.S
index 4c12a74..5a8f84b 100644 (file)
--- a/libc/sysdeps/linux/arm/__longjmp.S
+++ b/libc/sysdeps/linux/arm/__longjmp.S
@@ -32,7 +32,7 @@ __longjmp:
        movs    r0, r1          /* get the return value in place */
        moveq   r0, #1          /* can't let setjmp() return zero! */
 
-#ifdef __UCLIBC_HAS_FLOATS__
+#if defined __UCLIBC_HAS_FLOATS__ && ! defined __SOFTFP__
        lfmfd   f4, 4, [ip] !   /* load the floating point regs */
 #endif 
 

diff --git a/libc/sysdeps/linux/arm/setjmp.S b/libc/sysdeps/linux/arm/setjmp.S
index 166e4ef..d737237 100644 (file)
--- a/libc/sysdeps/linux/arm/setjmp.S
+++ b/libc/sysdeps/linux/arm/setjmp.S
@@ -27,7 +27,7 @@
 .align 4;
 __sigsetjmp:
        /* Save registers */
-#ifdef __UCLIBC_HAS_FLOATS__
+#if defined __UCLIBC_HAS_FLOATS__ && ! defined __SOFTFP__
        sfmea   f4, 4, [r0]!
 #endif
        stmia   r0, {v1-v6, sl, fp, sp, lr}