diff options
| author | Valentin Gehrke <valentin.gehrke@kernkonzept.com> | 2024-07-18 15:06:48 +0200 | 
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-07-19 08:15:36 +0200 | 
| commit | 1d8ade50e8c5d9727a1f5a8d5af2f5d643a812d3 (patch) | |
| tree | b4a9393392369f4d6eae71877a1912cc7806d103 /libc/sysdeps/linux/arm/setjmp.S | |
| parent | 903da45dde43836e35a295226c5b1efccd413c08 (diff) | |
arm: Replace deprecated asm instructions for ARMv8 AArch32
ARMv8 has particular restrictions which coprocessor can be used and as
such these instructions, which were likely used for backwards
compatibility purposes, cannot be used on ARMv8. We solve this by
checking for ARMv8 and then using the corresponding mnemonics which were
placed in comments alongside the instructions causing issues.
Fixes the following errors:
.../setjmp.S:59:6: error: invalid operand for instruction
 stc p11, cr8, [r12], #68
     ^
.../setjmp.S:62:6: error: invalid operand for instruction
 mrc p10, 7, r2, cr1, cr0, 0
     ^
.../__longjmp.S:69:6: error: invalid operand for instruction
 ldc p11, cr8, [r12], #68
     ^
.../__longjmp.S:73:6: error: invalid operand for instruction
 mcr p10, 7, r1, cr1, cr0, 0
     ^
Signed-off-by: Marcus Haehnel <marcus.haehnel@kernkonzept.com>
Diffstat (limited to 'libc/sysdeps/linux/arm/setjmp.S')
| -rw-r--r-- | libc/sysdeps/linux/arm/setjmp.S | 8 | 
1 files changed, 8 insertions, 0 deletions
diff --git a/libc/sysdeps/linux/arm/setjmp.S b/libc/sysdeps/linux/arm/setjmp.S index f7a74cc5a..d5bc9ba65 100644 --- a/libc/sysdeps/linux/arm/setjmp.S +++ b/libc/sysdeps/linux/arm/setjmp.S @@ -54,6 +54,13 @@ __sigsetjmp:  #endif  #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__  # ifdef __VFP_FP__ +#  if __ARM_ARCH >= 8 +	/* Store the VFP registers.  */ +	fstmiax ip!, {d8-d15} +	/* Store the floating-point status register.  */ +	fmrx    r2, fpscr +	str     r2, [ip], #4 +#  else  	/* Store the VFP registers.  */  	/* Following instruction is fstmiax ip!, {d8-d15}.  */  	stc	p11, cr8, [r12], #68 @@ -61,6 +68,7 @@ __sigsetjmp:  	/* Following instruction is fmrx r2, fpscr.  */  	mrc	p10, 7, r2, cr1, cr0, 0  	str	r2, [ip], #4 +#  endif  # elif defined __MAVERICK__  	cfstrd	mvd4,  [ip], #8 ; nop  	cfstrd	mvd5,  [ip], #8 ; nop  | 
