This is an automated email from the ASF dual-hosted git repository.
raiden00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new dc1a2135de tools/ci: Upgrade arm/arm64 toolchain to 13.2.Rel1
dc1a2135de is described below
commit dc1a2135de5ce63a45b72cfcd1dd18b32108b42e
Author: Xiang Xiao <[email protected]>
AuthorDate: Sun Nov 26 11:39:53 2023 +0800
tools/ci: Upgrade arm/arm64 toolchain to 13.2.Rel1
from https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
Signed-off-by: Xiang Xiao <[email protected]>
---
tools/ci/cibuild.sh | 20 ++++++++++----------
tools/ci/docker/linux/Dockerfile | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index e86ef0c846..93b42986c5 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -74,11 +74,11 @@ function arm-gcc-toolchain {
;;
esac
cd "${tools}"
- wget --quiet
https://developer.arm.com/-/media/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
- xz -d arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
- tar xf arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-arm-none-eabi.tar
- mv arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-arm-none-eabi
gcc-arm-none-eabi
- rm arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-arm-none-eabi.tar
+ wget --quiet
https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-arm-none-eabi.tar.xz
+ xz -d arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-arm-none-eabi.tar.xz
+ tar xf arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-arm-none-eabi.tar
+ mv arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-arm-none-eabi
gcc-arm-none-eabi
+ rm arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-arm-none-eabi.tar
fi
command arm-none-eabi-gcc --version
@@ -98,11 +98,11 @@ function arm64-gcc-toolchain {
;;
esac
cd "${tools}"
- wget --quiet
https://developer.arm.com/-/media/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-aarch64-none-elf.tar.xz
- xz -d arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-aarch64-none-elf.tar.xz
- tar xf arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-aarch64-none-elf.tar
- mv arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-aarch64-none-elf
gcc-aarch64-none-elf
- rm arm-gnu-toolchain-12.3.rel1${flavor}-x86_64-aarch64-none-elf.tar
+ wget --quiet
https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-aarch64-none-elf.tar.xz
+ xz -d arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-aarch64-none-elf.tar.xz
+ tar xf arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-aarch64-none-elf.tar
+ mv arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-aarch64-none-elf
gcc-aarch64-none-elf
+ rm arm-gnu-toolchain-13.2.Rel1${flavor}-x86_64-aarch64-none-elf.tar
fi
command aarch64-none-elf-gcc --version
diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index 52c03c4f62..ab622d0e8f 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -106,7 +106,7 @@ RUN mkdir clang-arm-none-eabi && \
# Download the latest ARM GCC toolchain prebuilt by ARM
RUN mkdir gcc-arm-none-eabi && \
- curl -s -L
"https://developer.arm.com/-/media/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-arm-none-eabi.tar.xz";
\
+ curl -s -L
"https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi.tar.xz";
\
| tar -C gcc-arm-none-eabi --strip-components 1 -xJ
###############################################################################
@@ -115,7 +115,7 @@ RUN mkdir gcc-arm-none-eabi && \
FROM nuttx-toolchain-base AS nuttx-toolchain-arm64
# Download the latest ARM64 GCC toolchain prebuilt by ARM
RUN mkdir gcc-aarch64-none-elf && \
- curl -s -L
"https://developer.arm.com/-/media/Files/downloads/gnu/12.3.rel1/binrel/arm-gnu-toolchain-12.3.rel1-x86_64-aarch64-none-elf.tar.xz";
\
+ curl -s -L
"https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-elf.tar.xz";
\
| tar -C gcc-aarch64-none-elf --strip-components 1 -xJ
###############################################################################
