Skip to content

Commit

Permalink
arm/armv8-r: fix armv8 build error without neon
Browse files Browse the repository at this point in the history
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 <lijinliang1@lixiang.com>
  • Loading branch information
jinliangli authored and xiaoxiang781216 committed Sep 27, 2024
1 parent 0bf2c9c commit 19230e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/arm/src/armv8-r/Toolchain.defs
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ ARCHCPUFLAGS += -march=armv8-r
ifeq ($(CONFIG_ARCH_FPU),y)
LLVM_ABITYPE := eabihf

ifeq ($(CONFIG_ARCH_CORTEXR52)$(CONFIG_ARM_NEON),yy)
ifeq ($(CONFIG_ARM_NEON),y)
ARCHCPUFLAGS += -mfpu=neon-fp-armv8
else
ARCHCPUFLAGS += -mfpu=fpv5-sp-d16
ARCHCPUFLAGS += -mfpu=fp-armv8
endif
ifeq ($(CONFIG_ARM_FPU_ABI_SOFT),y)
ARCHCPUFLAGS += -mfloat-abi=softfp
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/src/cmake/armv8-r.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ endif()

if(CONFIG_ARCH_FPU)

if(CONFIG_ARCH_CORTEXR52 AND CONFIG_ARM_NEON)
if(CONFIG_ARM_NEON)
list(APPEND PLATFORM_FLAGS -mfpu=neon-fp-armv8)
else()
list(APPEND PLATFORM_FLAGS -mfpu=fpv5-sp-d16)
list(APPEND PLATFORM_FLAGS -mfpu=fp-armv8)
endif()
if(CONFIG_ARM_FPU_ABI_SOFT)
list(APPEND PLATFORM_FLAGS -mfloat-abi=softfp)
Expand Down

0 comments on commit 19230e3

Please sign in to comment.