From 0c8d3489e62007e563822e9dd6daa14854af7667 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Tue, 10 May 2022 17:25:46 +0800 Subject: [PATCH] arch/arm: Fix target 'arm_fpuconfig.o' given more than once in the same rule Signed-off-by: Xiang Xiao --- arch/arm/src/armv7-a/Make.defs | 3 ++- arch/arm/src/armv7-r/Make.defs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/src/armv7-a/Make.defs b/arch/arm/src/armv7-a/Make.defs index 19a60b3954..e0809db2c1 100644 --- a/arch/arm/src/armv7-a/Make.defs +++ b/arch/arm/src/armv7-a/Make.defs @@ -36,7 +36,7 @@ endif # Common assembly language files -CMN_ASRCS += arm_cpuhead.S arm_fpuconfig.S arm_vectoraddrexcptn.S +CMN_ASRCS += arm_cpuhead.S arm_vectoraddrexcptn.S CMN_ASRCS += arm_vectors.S cp15_cache_size.S cp15_clean_dcache_all.S CMN_ASRCS += cp15_clean_dcache.S cp15_coherent_dcache.S CMN_ASRCS += cp15_flush_dcache_all.S cp15_flush_dcache.S @@ -84,6 +84,7 @@ endif ifeq ($(CONFIG_ARCH_FPU),y) CMN_CSRCS += arm_fpucmp.c + CMN_ASRCS += arm_fpuconfig.S endif ifeq ($(CONFIG_SMP),y) diff --git a/arch/arm/src/armv7-r/Make.defs b/arch/arm/src/armv7-r/Make.defs index f6f29a67de..171eba7e5c 100644 --- a/arch/arm/src/armv7-r/Make.defs +++ b/arch/arm/src/armv7-r/Make.defs @@ -36,7 +36,7 @@ CMN_CSRCS += arm_syscall.c arm_tcbinfo.c arm_undefinedinsn.c # Common C source files -CMN_ASRCS += arm_fpuconfig.S arm_head.S arm_vectoraddrexcptn.S +CMN_ASRCS += arm_head.S arm_vectoraddrexcptn.S CMN_ASRCS += arm_vectors.S arm_vectortab.S cp15_cache_size.S CMN_ASRCS += cp15_clean_dcache_all.S cp15_clean_dcache.S CMN_ASRCS += cp15_coherent_dcache.S cp15_flush_dcache_all.S