From e9fbe126bc13bc0ce594b73b85564f10b3bfdb56 Mon Sep 17 00:00:00 2001
From: Yvan Roux <yvan.roux@foss.st.com>
Date: Thu, 25 Jan 2024 16:18:33 +0100
Subject: [PATCH] Release GNU Tools for STM32 12.3.rel1.20240107-1100

Signed-off-by: Yvan ROUX <yvan.roux@st.com>
---
 build-toolchain.sh                            | 25 +++++++++++++++++--
 .../27_io/basic_istream/ignore/char/94749.cc  |  2 +-
 .../basic_istream/ignore/wchar_t/94749.cc     |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/build-toolchain.sh b/build-toolchain.sh
index 205536e83d6..ff5824a8e70 100755
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -265,6 +265,7 @@ if [ "x$skip_native_build" != "xyes" ] ; then
         --enable-interwork \
         --enable-plugins \
         --with-sysroot=$INSTALLDIR_NATIVE/arm-none-eabi \
+        --with-zstd=no \
         "--with-pkgversion=$PKGVERSION"
 
     make -j$JOBS
@@ -311,6 +312,7 @@ if [ "x$skip_native_build" != "xyes" ] ; then
         --with-gnu-ld \
         --with-python-dir=share/gcc-arm-none-eabi \
         --with-sysroot=$INSTALLDIR_NATIVE/arm-none-eabi \
+        --with-zstd=no \
         ${GCC_CONFIG_OPTS}                              \
         "${GCC_CONFIG_OPTS_LCPP}"                              \
         "--with-pkgversion=$PKGVERSION" \
@@ -434,6 +436,7 @@ if [ "x$skip_native_build" != "xyes" ] ; then
         --with-headers=yes \
         --with-python-dir=share/gcc-arm-none-eabi \
         --with-sysroot=$INSTALLDIR_NATIVE/arm-none-eabi \
+        --with-zstd=no \
         $GCC_CONFIG_OPTS                                \
         "${GCC_CONFIG_OPTS_LCPP}"                              \
         "--with-pkgversion=$PKGVERSION" \
@@ -493,6 +496,7 @@ if [ "x$skip_native_build" != "xyes" ] ; then
         --with-headers=yes \
         --with-python-dir=share/gcc-arm-none-eabi \
         --with-sysroot=$BUILDDIR_NATIVE/target-libs/arm-none-eabi \
+        --with-zstd=no \
         $GCC_CONFIG_OPTS \
         "${GCC_CONFIG_OPTS_LCPP}"                              \
         "--with-pkgversion=$PKGVERSION" \
@@ -541,6 +545,7 @@ if [ "x$skip_native_build" != "xyes" ] ; then
             --with-libexpat \
             --with-lzma=no \
             --with-system-gdbinit=$INSTALLDIR_NATIVE/$HOST_NATIVE/arm-none-eabi/lib/gdbinit \
+            --with-zstd=no \
             $GDB_CONFIG_OPTS \
             $GDB_EXTRA_CONFIG_OPTS \
             '--with-gdb-datadir='\''${prefix}'\''/arm-none-eabi/share/gdb' \
@@ -674,7 +679,23 @@ if [ "x$skip_native_build" != "xyes" ] ; then
         time ${TAR} czf $PACKAGEDIR/${PACKAGE_NAME_NATIVE}-build.tar.gz --owner=0 --group=0 build-native/
         time ${TAR} czf $PACKAGEDIR/${PACKAGE_NAME_NATIVE}-install.tar.gz --owner=0 --group=0 install-native/
         popd
-    fi  # end of if [ "x$skip_package_bins" != "xyes" ]; then
+    fi
+
+    # Validate binaries on macos
+    if [ "x$BUILD" == "xx86_64-apple-darwin10" ]; then
+        echo Task [III-14] /Validate tool dependencies/
+        invalid=()
+        while read line; do
+          if objdump -macho --dylibs-used "$line" | grep -q '/usr/local/'; then
+            invalid+=($line)
+          fi
+        done <<< $(find $INSTALLDIR_NATIVE/ -type f |  xargs file | grep "Mach-O " | cut -d: -f1)
+
+        if [ ${#invalid[@]} -ne 0 ]; then
+          echo -e "Illegal dependency detected!${invalid[@]/#/\\n}\nAborting..."
+          exit 1
+        fi
+    fi
 fi  #if [ "x$skip_native_build" != "xyes" ] ; then
 
 # skip building mingw32 toolchain if "--skip_mingw32" specified
@@ -932,7 +953,7 @@ if [ "x$skip_mingw32" != "xyes" ] ; then
         time ${TAR} czf $PACKAGEDIR/${PACKAGE_NAME_MINGW}-build.tar.gz --owner=0 --group=0 build-mingw/
         time ${TAR} czf $PACKAGEDIR/${PACKAGE_NAME_MINGW}-install.tar.gz --owner=0 --group=0 install-mingw/
         popd
-    fi #end of if [ "x$skip_package_bins" != "xyes" ]; then
+    fi
 fi #end of if [ "x$skip_mingw32" != "xyes" ] ;
 
 if [ "x$skip_package_sources" != "xyes" ]; then
diff --git a/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/94749.cc b/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/94749.cc
index a396e3e2b28..427ca50567b 100644
--- a/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/94749.cc
+++ b/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/94749.cc
@@ -221,8 +221,8 @@ main()
   test02();
   test03();
   test04();
-  test05();
 #ifndef SIMULATOR_TEST
+  test05();
   test06();
 #endif
 }
diff --git a/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc b/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc
index e2d951e3942..d4b64dfbd89 100644
--- a/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc
+++ b/src/gcc/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc
@@ -221,8 +221,8 @@ main()
   test02();
   test03();
   test04();
-  test05();
 #ifndef SIMULATOR_TEST
+  test05();
   test06();
 #endif
 }