sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm/clang: replace deprecated parameter

Browse Source 
In LLVM Clang 17.0.1, the `--config` parameter has been deprecated and replaced by the `-target` parameter

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2023-11-28 15:19:11 +08:00 committed by Xiang Xiao
parent e2a82f008a
commit 1ce1a19afd
5 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/armv6-m/Toolchain.defs
View File

@ -30,7 +30,7 @@ LLVM_CPUTYPE := cortex-m0
# Clang Configuration files
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
TOOLCHAIN_CLANG_CONFIG = --config armv6m_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv6m_soft_nofp
else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)
LDFLAGS += --cpu=Cortex-M0
endif

10
arch/arm/src/armv7-m/Toolchain.defs
View File

@ -72,18 +72,18 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
ifeq ($(CONFIG_ARCH_CORTEXM4),y)
ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_CLANG_CONFIG = --config armv7em_hard_fpv4_sp_d16
TOOLCHAIN_CLANG_CONFIG = armv7em_hard_fpv4_sp_d16
else
TOOLCHAIN_CLANG_CONFIG = --config armv7em_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv7em_soft_nofp
endif
else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_CLANG_CONFIG = --config armv7em_hard_fpv5_d16
TOOLCHAIN_CLANG_CONFIG = armv7em_hard_fpv5_d16
else
TOOLCHAIN_CLANG_CONFIG = --config armv7em_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv7em_soft_nofp
endif
else # ifeq ($(CONFIG_ARCH_CORTEXM3),y)
TOOLCHAIN_CLANG_CONFIG = --config armv7m_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv7m_soft_nofp
endif
else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)

18
arch/arm/src/armv8-m/Toolchain.defs
View File

@ -109,30 +109,30 @@ endif
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
ifeq ($(CONFIG_ARCH_CORTEXM23),y)
TOOLCHAIN_CLANG_CONFIG = --config armv8m.main_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv8m.main_soft_nofp
else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_CLANG_CONFIG = --config armv8m.main_hard_fp
TOOLCHAIN_CLANG_CONFIG = armv8m.main_hard_fp
else
TOOLCHAIN_CLANG_CONFIG = --config armv8m.main_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv8m.main_soft_nofp
endif
else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_CLANG_CONFIG = --config armv8m.main_hard_fp
TOOLCHAIN_CLANG_CONFIG = armv8m.main_hard_fp
else
TOOLCHAIN_CLANG_CONFIG = --config armv8m.main_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv8m.main_soft_nofp
endif
else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_CLANG_CONFIG = --config armv8.1m.main_hard_fp
TOOLCHAIN_CLANG_CONFIG = armv8.1m.main_hard_fp
else
TOOLCHAIN_CLANG_CONFIG = --config armv8.1m.main_soft_nofp_nomve
TOOLCHAIN_CLANG_CONFIG = armv8.1m.main_soft_nofp_nomve
endif
else ifeq ($(CONFIG_ARCH_CORTEXM85),y)
ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_CLANG_CONFIG = --config armv8.1m.main_hard_fp
TOOLCHAIN_CLANG_CONFIG = armv8.1m.main_hard_fp
else
TOOLCHAIN_CLANG_CONFIG = --config armv8.1m.main_soft_nofp_nomve
TOOLCHAIN_CLANG_CONFIG = armv8.1m.main_soft_nofp_nomve
endif
endif

9
arch/arm/src/common/Toolchain.defs
View File

@ -185,7 +185,14 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
TOOLCHAIN_CLANG_CONFIG := $(TOOLCHAIN_CLANG_CONFIG)_nosys
endif
ARCHCPUFLAGS += $(TOOLCHAIN_CLANG_CONFIG).cfg
ifeq ($(CLANGVER),17.0)
TOOLCHAIN_CLANG_OPTION = -target
ARCHCPUFLAGS += --target=arm-none-eabi
else
TOOLCHAIN_CLANG_OPTION = --config
endif
ARCHCPUFLAGS := $(TOOLCHAIN_CLANG_OPTION) $(TOOLCHAIN_CLANG_CONFIG).cfg $(ARCHCPUFLAGS)
endif
# ARM Compiler Clang toolchain

2
arch/arm/src/tlsr82/Toolchain.defs
View File

@ -21,7 +21,7 @@
# Clang Configuration files
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
TOOLCHAIN_CLANG_CONFIG = --config armv6m_soft_nofp
TOOLCHAIN_CLANG_CONFIG = armv6m_soft_nofp
endif
# Generic GNU EABI toolchain