d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armv6 soft float build fixed

Browse Source 
Add ifdefs in the assembler for soft-float compile case.

Submitted by: Hiroki Mori
Reviewed by: ray@
Differential Review: https://reviews.freebsd.org/D22352
This commit is contained in:
Warner Losh 2019-11-14 01:38:48 +00:00
parent 3e85ec2339
commit 3d71e85c06
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/arm/aeabi/aeabi_vfp.h
View File

@ -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

4
lib/libc/arm/gen/_setjmp.S
View File

@ -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)]

4
lib/libc/arm/gen/setjmp.S
View File

@ -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)]