From 0f3f5d091ad510f7b5f4556c8d1805b073279e51 Mon Sep 17 00:00:00 2001 From: chao an Date: Wed, 12 Oct 2022 11:03:03 +0800 Subject: [PATCH] tools/ci: patch for gcc-arm-none-eabi to 11.3.Rel1 August 08, 2022 Fix Wrong Newlib version strings, error when stdlib.h is included Reference: https://community.arm.com/support-forums/f/compilers-and-libraries-forum/53470/arm-gnu-toolchain-11-3-rel1-x86_64-arm-none-eabi-wrong-newlib-version-strings-error-when-stdlib-h-is-included Signed-off-by: chao an --- tools/ci/cibuild.sh | 1 + ...-workaround-for-newlib-version-break.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh index c210bea020..e300b676fa 100755 --- a/tools/ci/cibuild.sh +++ b/tools/ci/cibuild.sh @@ -187,6 +187,7 @@ function arm-gcc-toolchain { 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 diff --git a/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch b/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch new file mode 100644 index 0000000000..cd10db3c5f --- /dev/null +++ b/tools/ci/patch/arm-none-eabi-workaround-for-newlib-version-break.patch @@ -0,0 +1,38 @@ +From 819ab4ac433b809fdaca33246e2bffa1426acc0f Mon Sep 17 00:00:00 2001 +From: chao an +Date: Tue, 11 Oct 2022 15:27:37 +0800 +Subject: [PATCH] arm-none-eabi: workaround for newlib version break + +Signed-off-by: chao an +--- + 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 +