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

Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2"

Browse Source 
This reverts commit b4bab51e86.

Issue:
Builtin math symbols are missing on llvm 15.0.2(libm.a):
https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/issues/158

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2022-11-22 23:26:54 +08:00 committed by Brennan Ashton
parent d8051ba979
commit f23ec0f995
6 changed files with 20 additions and 20 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

@ -26,7 +26,7 @@ TOOLCHAIN_MFLOAT := -mfloat-abi=soft
# Clang Configuration files # Clang Configuration files
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
TOOLCHAIN_MARCH := --config armv6m_soft_nofp TOOLCHAIN_MARCH := --config armv6m_soft_nofp_nosys
else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y) else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)
LDFLAGS += --cpu=Cortex-M0 LDFLAGS += --cpu=Cortex-M0
endif endif

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

@ -61,18 +61,18 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
ifeq ($(CONFIG_ARCH_CORTEXM4),y) ifeq ($(CONFIG_ARCH_CORTEXM4),y)
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16 TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16_nosys
else else
TOOLCHAIN_MARCH += --config armv7em_soft_nofp TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys
endif endif
else ifeq ($(CONFIG_ARCH_CORTEXM7),y) else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16 TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16_nosys
else else
TOOLCHAIN_MARCH += --config armv7em_soft_nofp TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys
endif endif
else # ifeq ($(CONFIG_ARCH_CORTEXM3),y) else # ifeq ($(CONFIG_ARCH_CORTEXM3),y)
TOOLCHAIN_MARCH += --config armv7m_soft_nofp TOOLCHAIN_MARCH += --config armv7m_soft_nofp_nosys
endif endif
else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y) else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)

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

@ -63,24 +63,24 @@ endif
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y) ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
ifeq ($(CONFIG_ARCH_CORTEXM23),y) ifeq ($(CONFIG_ARCH_CORTEXM23),y)
TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
else ifeq ($(CONFIG_ARCH_CORTEXM33),y) else ifeq ($(CONFIG_ARCH_CORTEXM33),y)
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MARCH += --config armv8m.main_hard_fp TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys
else else
TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
endif endif
else ifeq ($(CONFIG_ARCH_CORTEXM35P),y) else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MARCH += --config armv8m.main_hard_fp TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys
else else
TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
endif endif
else ifeq ($(CONFIG_ARCH_CORTEXM55),y) else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
ifeq ($(CONFIG_ARCH_FPU),y) ifeq ($(CONFIG_ARCH_FPU),y)
TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp_nosys
else else
TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve_nosys
endif endif
endif endif

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

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

8
tools/ci/cibuild.sh
View File

@ -60,11 +60,11 @@ function arm-clang-toolchain {
if [ ! -f "${prebuilt}/clang-arm-none-eabi/bin/clang" ]; then if [ ! -f "${prebuilt}/clang-arm-none-eabi/bin/clang" ]; then
cd "${prebuilt}" cd "${prebuilt}"
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-15.0.2/LLVMEmbeddedToolchainForArm-15.0.2-Linux-x86_64.tar.gz curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-14.0.0/LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz
mkdir -p clang-arm-none-eabi tar zxf LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz
tar zxf LLVMEmbeddedToolchainForArm-15.0.2-Linux-x86_64.tar.gz -C clang-arm-none-eabi mv LLVMEmbeddedToolchainForArm-14.0.0 clang-arm-none-eabi
cp /usr/bin/clang-extdef-mapping-10 clang-arm-none-eabi/bin/clang-extdef-mapping cp /usr/bin/clang-extdef-mapping-10 clang-arm-none-eabi/bin/clang-extdef-mapping
rm LLVMEmbeddedToolchainForArm-15.0.2-Linux-x86_64.tar.gz rm LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz
fi fi
clang --version clang --version
} }

4
tools/ci/docker/linux/Dockerfile
View File

@ -85,8 +85,8 @@ WORKDIR /tools
FROM nuttx-toolchain-base AS nuttx-toolchain-arm FROM nuttx-toolchain-base AS nuttx-toolchain-arm
# Download the latest ARM clang toolchain prebuilt by ARM # Download the latest ARM clang toolchain prebuilt by ARM
RUN mkdir clang-arm-none-eabi && \ RUN mkdir clang-arm-none-eabi && \
curl -s -L "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-15.0.2/LLVMEmbeddedToolchainForArm-15.0.2-Linux-x86_64.tar.gz" \ curl -s -L "https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-14.0.0/LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz" \
| tar -C clang-arm-none-eabi --strip-components 0 -xz | tar -C clang-arm-none-eabi --strip-components 1 -xz
# Download the latest ARM GCC toolchain prebuilt by ARM # Download the latest ARM GCC toolchain prebuilt by ARM
RUN mkdir gcc-arm-none-eabi && \ RUN mkdir gcc-arm-none-eabi && \