diff options
| author | Warner Losh <imp@FreeBSD.org> | 2019-11-14 01:38:48 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2019-11-14 01:38:48 +0000 |
| commit | 3d71e85c06676230da4d48ccedd9456623748f99 (patch) | |
| tree | bcd69ec9a9979a66c0f4ac4de44ab52e25c28d9a /lib/libc/arm | |
| parent | 3e85ec233941b13d1822228438474fd5946b0626 (diff) | |
Notes
Diffstat (limited to 'lib/libc/arm')
| -rw-r--r-- | lib/libc/arm/aeabi/aeabi_vfp.h | 2 | ||||
| -rw-r--r-- | lib/libc/arm/gen/_setjmp.S | 4 | ||||
| -rw-r--r-- | lib/libc/arm/gen/setjmp.S | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/arm/aeabi/aeabi_vfp.h b/lib/libc/arm/aeabi/aeabi_vfp.h index 927652f193ca..a7b6b7b54618 100644 --- a/lib/libc/arm/aeabi/aeabi_vfp.h +++ b/lib/libc/arm/aeabi/aeabi_vfp.h @@ -67,7 +67,7 @@ * C Helper macros */ -#if __ARM_ARCH >= 6 +#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) /* * Generate a function that will either call into the VFP implementation, * or the soft float version for a given __aeabi_* helper. The function diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S index 268a43ed6ed3..d79697ace307 100644 --- a/lib/libc/arm/gen/_setjmp.S +++ b/lib/libc/arm/gen/_setjmp.S @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); ENTRY(_setjmp) ldr r1, .L_setjmp_magic -#if !defined(_STANDALONE) && __ARM_ARCH >= 6 +#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) add r2, r0, #(_JB_REG_D8 * 4) vstmia r2, {d8-d15} vmrs r2, fpscr @@ -94,7 +94,7 @@ ENTRY(_longjmp) teq ip, r2 /* magic correct? */ bne botch /* no, botch */ -#if !defined(_STANDALONE) && __ARM_ARCH >= 6 +#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) add ip, r0, #(_JB_REG_D8 * 4) vldmia ip, {d8-d15} ldr ip, [r0, #(_JB_REG_FPSCR * 4)] diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S index 22d6345fa2c6..58353ca9a5fc 100644 --- a/lib/libc/arm/gen/setjmp.S +++ b/lib/libc/arm/gen/setjmp.S @@ -64,7 +64,7 @@ ENTRY(setjmp) ldr r1, .Lsetjmp_magic -#if __ARM_ARCH >= 6 +#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) add r2, r0, #(_JB_REG_D8 * 4) vstmia r2, {d8-d15} vmrs r2, fpscr @@ -105,7 +105,7 @@ ENTRY(__longjmp) bl PIC_SYM(_C_LABEL(sigprocmask), PLT) ldmfd sp!, {r0-r2, r14} -#if __ARM_ARCH >= 6 +#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) add ip, r0, #(_JB_REG_D8 * 4) vldmia ip, {d8-d15} ldr ip, [r0, #(_JB_REG_FPSCR * 4)] |