Skip to content

Revert "tools/ci: Update GNU Arm Embedded Toolchain to Version 12.2-2022.12.22" #8598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Feb 20, 2023
Merged

Revert "tools/ci: Update GNU Arm Embedded Toolchain to Version 12.2-2022.12.22" #8598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions tools/ci/cibuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,12 @@ function arm-gcc-toolchain {
;;
esac
cd "${tools}"
wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
xz -d arm-gnu-toolchain-12.2.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
tar xf arm-gnu-toolchain-12.2.rel1${flavor}-x86_64-arm-none-eabi.tar
mv arm-gnu-toolchain-12.2.rel1${flavor}-x86_64-arm-none-eabi gcc-arm-none-eabi
rm arm-gnu-toolchain-12.2.rel1${flavor}-x86_64-arm-none-eabi.tar
wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
xz -d arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar.xz
tar xf arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar
mv arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi gcc-arm-none-eabi
patch -p0 < ${nuttx}/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch
rm arm-gnu-toolchain-11.3.rel1${flavor}-x86_64-arm-none-eabi.tar
fi

arm-none-eabi-gcc --version
Expand Down
6 changes: 4 additions & 2 deletions tools/ci/docker/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,10 @@ 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.2.rel1/binrel/arm-gnu-toolchain-12.2.rel1-x86_64-arm-none-eabi.tar.xz" \
| tar -C gcc-arm-none-eabi --strip-components 1 -xJ
curl -s -L "https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz" \
| tar -C gcc-arm-none-eabi --strip-components 1 -xJ \
&& curl -s -L -O "https://github.com/apache/nuttx/master/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch" \
&& patch -p0 < arm-none-eabi-workaround-for-newlib-version-break.patch

###############################################################################
# Build image for tool required by ARM64 builds
Expand Down
38 changes: 38 additions & 0 deletions tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 819ab4ac433b809fdaca33246e2bffa1426acc0f Mon Sep 17 00:00:00 2001
From: chao an <anchao@xiaomi.com>
Date: Tue, 11 Oct 2022 15:27:37 +0800
Subject: [PATCH] arm-none-eabi: workaround for newlib version break

Signed-off-by: chao an <anchao@xiaomi.com>
---
arm-none-eabi/include/_newlib_version.h | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/arm-none-eabi/include/_newlib_version.h gcc-arm-none-eabi/arm-none-eabi/include/_newlib_version.h
index 0dbf962e..c5d2be6d 100644
--- a/arm-none-eabi/include/_newlib_version.h
+++ gcc-arm-none-eabi/arm-none-eabi/include/_newlib_version.h
@@ -3,16 +3,9 @@
#ifndef _NEWLIB_VERSION_H__
#define _NEWLIB_VERSION_H__ 1

-/* The newlib version in string format. */
-#define _NEWLIB_VERSION "@NEWLIB_VERSION@"
-
-/* The newlib major version number. */
-#define __NEWLIB__ @NEWLIB_MAJOR_VERSION@
-
-/* The newlib minor version number. */
-#define __NEWLIB_MINOR__ @NEWLIB_MINOR_VERSION@
-
-/* The newlib patch level. */
-#define __NEWLIB_PATCHLEVEL__ @NEWLIB_PATCHLEVEL_VERSION@
+#define _NEWLIB_VERSION "4.2.0"
+#define __NEWLIB__ 4
+#define __NEWLIB_MINOR__ 2
+#define __NEWLIB_PATCHLEVEL__ 0

#endif /* !_NEWLIB_VERSION_H__ */
--
2.25.1