Skip to content

Commit 19230e3

Browse files
jinlianglixiaoxiang781216
authored andcommitted
arm/armv8-r: fix armv8 build error without neon
Fix the build error: armv8-r/arm_vectors.S:205:Error: VFP single precision register expected -- `vstmdb.64 sp!,{d16-d31}' armv8-r/arm_vectors.S:242:Error: VFP single precision register expected -- `vldmia.64 r0!,{d16-d31}' Signed-off-by: Jinliang Li <[email protected]>
1 parent 0bf2c9c commit 19230e3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/arm/src/armv8-r/Toolchain.defs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ ARCHCPUFLAGS += -march=armv8-r
2323
ifeq ($(CONFIG_ARCH_FPU),y)
2424
LLVM_ABITYPE := eabihf
2525

26-
ifeq ($(CONFIG_ARCH_CORTEXR52)$(CONFIG_ARM_NEON),yy)
26+
ifeq ($(CONFIG_ARM_NEON),y)
2727
ARCHCPUFLAGS += -mfpu=neon-fp-armv8
2828
else
29-
ARCHCPUFLAGS += -mfpu=fpv5-sp-d16
29+
ARCHCPUFLAGS += -mfpu=fp-armv8
3030
endif
3131
ifeq ($(CONFIG_ARM_FPU_ABI_SOFT),y)
3232
ARCHCPUFLAGS += -mfloat-abi=softfp

arch/arm/src/cmake/armv8-r.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ endif()
2626

2727
if(CONFIG_ARCH_FPU)
2828

29-
if(CONFIG_ARCH_CORTEXR52 AND CONFIG_ARM_NEON)
29+
if(CONFIG_ARM_NEON)
3030
list(APPEND PLATFORM_FLAGS -mfpu=neon-fp-armv8)
3131
else()
32-
list(APPEND PLATFORM_FLAGS -mfpu=fpv5-sp-d16)
32+
list(APPEND PLATFORM_FLAGS -mfpu=fp-armv8)
3333
endif()
3434
if(CONFIG_ARM_FPU_ABI_SOFT)
3535
list(APPEND PLATFORM_FLAGS -mfloat-abi=softfp)

0 commit comments

Comments
 (0)