You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by bt...@apache.org on 2022/11/22 15:43:09 UTC
[incubator-nuttx] branch master updated: Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2"
This is an automated email from the ASF dual-hosted git repository.
btashton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new f23ec0f995 Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2"
f23ec0f995 is described below
commit f23ec0f995ec12613924117c0c7004b83cc32312
Author: chao an <an...@xiaomi.com>
AuthorDate: Tue Nov 22 23:26:54 2022 +0800
Revert "tools/ci/arm/llvm/clang: bump up LLVMEmbeddedToolchainForArm to release-15.0.2"
This reverts commit b4bab51e86e74e5c0ac50c43c52cf7246ffb39a0.
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 <an...@xiaomi.com>
---
arch/arm/src/armv6-m/Toolchain.defs | 2 +-
arch/arm/src/armv7-m/Toolchain.defs | 10 +++++-----
arch/arm/src/armv8-m/Toolchain.defs | 14 +++++++-------
arch/arm/src/tlsr82/Toolchain.defs | 2 +-
tools/ci/cibuild.sh | 8 ++++----
tools/ci/docker/linux/Dockerfile | 4 ++--
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/arm/src/armv6-m/Toolchain.defs b/arch/arm/src/armv6-m/Toolchain.defs
index b921a4bb57..c18787a736 100644
--- a/arch/arm/src/armv6-m/Toolchain.defs
+++ b/arch/arm/src/armv6-m/Toolchain.defs
@@ -26,7 +26,7 @@ TOOLCHAIN_MFLOAT := -mfloat-abi=soft
# Clang Configuration files
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)
LDFLAGS += --cpu=Cortex-M0
endif
diff --git a/arch/arm/src/armv7-m/Toolchain.defs b/arch/arm/src/armv7-m/Toolchain.defs
index 25971ceff4..07c942c38b 100644
--- a/arch/arm/src/armv7-m/Toolchain.defs
+++ b/arch/arm/src/armv7-m/Toolchain.defs
@@ -61,18 +61,18 @@ ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
ifeq ($(CONFIG_ARCH_CORTEXM4),y)
ifeq ($(CONFIG_ARCH_FPU),y)
- TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16
+ TOOLCHAIN_MARCH += --config armv7em_hard_fpv4_sp_d16_nosys
else
- TOOLCHAIN_MARCH += --config armv7em_soft_nofp
+ TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys
endif
else ifeq ($(CONFIG_ARCH_CORTEXM7),y)
ifeq ($(CONFIG_ARCH_FPU),y)
- TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16
+ TOOLCHAIN_MARCH += --config armv7em_hard_fpv5_d16_nosys
else
- TOOLCHAIN_MARCH += --config armv7em_soft_nofp
+ TOOLCHAIN_MARCH += --config armv7em_soft_nofp_nosys
endif
else # ifeq ($(CONFIG_ARCH_CORTEXM3),y)
- TOOLCHAIN_MARCH += --config armv7m_soft_nofp
+ TOOLCHAIN_MARCH += --config armv7m_soft_nofp_nosys
endif
else ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),y)
diff --git a/arch/arm/src/armv8-m/Toolchain.defs b/arch/arm/src/armv8-m/Toolchain.defs
index bba57b0364..8407e7cd8c 100644
--- a/arch/arm/src/armv8-m/Toolchain.defs
+++ b/arch/arm/src/armv8-m/Toolchain.defs
@@ -63,24 +63,24 @@ endif
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),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)
ifeq ($(CONFIG_ARCH_FPU),y)
- TOOLCHAIN_MARCH += --config armv8m.main_hard_fp
+ TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys
else
- TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp
+ TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
endif
else ifeq ($(CONFIG_ARCH_CORTEXM35P),y)
ifeq ($(CONFIG_ARCH_FPU),y)
- TOOLCHAIN_MARCH += --config armv8m.main_hard_fp
+ TOOLCHAIN_MARCH += --config armv8m.main_hard_fp_nosys
else
- TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp
+ TOOLCHAIN_MARCH += --config armv8m.main_soft_nofp_nosys
endif
else ifeq ($(CONFIG_ARCH_CORTEXM55),y)
ifeq ($(CONFIG_ARCH_FPU),y)
- TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp
+ TOOLCHAIN_MARCH += --config armv8.1m.main_hard_fp_nosys
else
- TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve
+ TOOLCHAIN_MARCH += --config armv8.1m.main_soft_nofp_nomve_nosys
endif
endif
diff --git a/arch/arm/src/tlsr82/Toolchain.defs b/arch/arm/src/tlsr82/Toolchain.defs
index f473af6a14..410eae8aa9 100644
--- a/arch/arm/src/tlsr82/Toolchain.defs
+++ b/arch/arm/src/tlsr82/Toolchain.defs
@@ -21,7 +21,7 @@
# Clang Configuration files
ifeq ($(CONFIG_ARM_TOOLCHAIN_CLANG),y)
- TOOLCHAIN_MARCH := --config armv6m_soft_nofp
+ TOOLCHAIN_MARCH := --config armv6m_soft_nofp_nosys
endif
# Generic GNU EABI toolchain
diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index 8465b7d841..7abf228f43 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -60,11 +60,11 @@ function arm-clang-toolchain {
if [ ! -f "${prebuilt}/clang-arm-none-eabi/bin/clang" ]; then
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
- mkdir -p clang-arm-none-eabi
- tar zxf LLVMEmbeddedToolchainForArm-15.0.2-Linux-x86_64.tar.gz -C clang-arm-none-eabi
+ 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
+ tar zxf LLVMEmbeddedToolchainForArm-14.0.0-linux.tar.gz
+ mv LLVMEmbeddedToolchainForArm-14.0.0 clang-arm-none-eabi
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
clang --version
}
diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index ef47f385a2..fe92c9d924 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -85,8 +85,8 @@ WORKDIR /tools
FROM nuttx-toolchain-base AS nuttx-toolchain-arm
# Download the latest ARM clang toolchain prebuilt by ARM
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" \
- | tar -C clang-arm-none-eabi --strip-components 0 -xz
+ 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 1 -xz
# Download the latest ARM GCC toolchain prebuilt by ARM
RUN mkdir gcc-arm-none-eabi && \