From 47760a8d766f7c717a14d81d2ea59d2d7b8461c2 Mon Sep 17 00:00:00 2001
From: Chongyun Lee <uchkks@protonmail.com>
Date: Sat, 28 Oct 2023 03:22:21 +0800
Subject: [PATCH] gcc-toolchain: bump

---
 common-files/prebuilt-gcc.json      | 50 ++++++++++++++---------------
 common-files/setup_toolchain_gcc.sh | 14 ++++----
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/common-files/prebuilt-gcc.json b/common-files/prebuilt-gcc.json
index 53ca6c95e..1fdbbde7b 100644
--- a/common-files/prebuilt-gcc.json
+++ b/common-files/prebuilt-gcc.json
@@ -1,52 +1,52 @@
 {
   "13": {
     "version": "13.2.0",
-    "revision": "0",
+    "revision": "1",
     "checksums": {
-      "aarch64": "e392868c06fb79105e48035d1ece1922cb476ab3a6ab62e47b1ee236454c1ad2",
-      "arm": "b5e35c84514af8de38d6ab870694bfd45db403bcde5ba50076ab2d7134e0ef31",
-      "i686": "95405836995e7fae60446efa41fb78c7d3cb98d454892ac98e8ebfdfb4ec295d",
-      "x86_64": "94dd48fdd4644e5e748d717fc8c76445095bb825c30b3f2bb0f8d1ec6b848213"
+      "aarch64": "a52a67e3e01b527e50545ea060b34dfe6058982deb65a941491577bd1b37f434",
+      "arm": "a715c2112e2ce9709fcc4fb9eaedc65e2667b77e077d872b6bc7aeda8fd187f3",
+      "i686": "2e319710ff55d71eacbd6aed7175f72b8807e290b54cd12f424ba05d5ba0a7b4",
+      "x86_64": "93c77864effb15381453382cb3be638e885a5e54d29950e2826b3bd2c4588ad2"
     }
   },
   "12": {
     "version": "12.3.0",
-    "revision": "0",
+    "revision": "1",
     "checksums": {
-      "aarch64": "bd9bdabe03a588f057a2a27300bb0e6e9cf5c2086528a15c6ad4bf92d8bd7204",
-      "arm": "460d3de9a3ca7c871ab61723c3e215f9bc5bfb5f14b73c3248d2767c457dc90b",
-      "i686": "c41dd635f816b2db48ab72c43f6d9baa22fcfe253121205476c62d0532f373ed",
-      "x86_64": "a9d566400ffeb07e5ba10e7d53a231a13a69ee572bf527510eef73f8d07b6f70"
+      "aarch64": "b9e8cd272bdc10b68b3daa74eab7301b314f7fdeee43af1e02a0ad7aef5627ba",
+      "arm": "7ac74326be0eeb4551453fd569bd6edbd53521ab12149300a23e4453cea9370f",
+      "i686": "60e63158f070040aed6cf097f6c5ca7ac94fe1edf5f80eabecdff0ac4af5735b",
+      "x86_64": "e16cc974b57773bac6f16569cc95318f5f3242943aa9e6075d60ed56128bfd49"
     }
   },
   "11": {
     "version": "11.4.0",
-    "revision": "0",
+    "revision": "2",
     "checksums": {
-      "aarch64": "0f0d4fcf62249d1ea699dd8d5330f3f8db2d119355b18d72342e1d5701dae5ca",
-      "arm": "57a4130ad50fc4fd228ce4bff0a8d35687fe47d1fb856d0c96e2c73e057fb118",
-      "i686": "0a1c6ad7c0df317569dee698718dbb58f57fef1efbc29f204312e66152a5ef3b",
-      "x86_64": "83e4364b05b331b58d7ee5d8fbbbdcbce26a340cddeea242e7babd6e169ebaad"
+      "aarch64": "56513eb495e9760f66795ec6d6ada04624a1bcdffc59aebb239ef2fc557915ce",
+      "arm": "157d3077d624d6f139fd87f3c9c369303a0ebdbf7b9f4b12b0fcf48cf3aef1db",
+      "i686": "085665d66b9fbf3413eb08aee90b1a966553facb96d093a63a3339c83c677c01",
+      "x86_64": "b47c64d9cb830a836e524b5384833773ae16e9b64ddcd3ca06290ccd879e08f1"
     }
   },
   "10": {
     "version": "10.5.0",
-    "revision": "0",
+    "revision": "1",
     "checksums": {
-      "aarch64": "17794f4bcaf368ec1f1bae441b9122a72ce390ca2976550e368797d88f46ff59",
-      "arm": "d3599c38a287f3e32f87e84e8ee57bbecce3421681cfd8ee2fa32a2d3245b74b",
-      "i686": "035f06875d18c87bb1521219f69ee5cb070d265023d642d17f830e4d98a15d40",
-      "x86_64": "2b36720e11426220aa3549886b77d404823c45a0c7cde17135e7d9c4b53f2011"
+      "aarch64": "537644da7c23f994c35b4be70b649401071cc9adddc2fa291ee48ae4bfbe0c8f",
+      "arm": "cdf0dce20169bfbc2e09e3bb295a1064a4e0e4a962a707650b957f50a3c56237",
+      "i686": "bfcba35a02fa2403b6d91d123a2d343b184661d7e961bb3d3e130fb0f0993200",
+      "x86_64": "01d70a66448bc51524a7fcdc3ed45accea76ea6e30d50326ea1ca75078ca271f"
     }
   },
   "9": {
     "version": "9.5.0",
-    "revision": "2",
+    "revision": "3",
     "checksums": {
-      "aarch64": "a841aaa14a24eae70b4c641745a2565399cc1078b7a3b7d9bedbe8756d8e3668",
-      "arm": "1afb75bf0b2bbbba6c202502795e9942cc4fbd3a520cf1a4e80f3e6b4d0ce5c6",
-      "i686": "cac1d10f890529fe46e682c38ccbc751bf06de79619363d49716e5f00138dd1b",
-      "x86_64": "a9388c249801e346b8dfec5f795a0524d713aa9e665470d8a0069555bb6c75a6"
+      "aarch64": "a4953f6a68c302b5b8a80f5d0d235c2f417d2ddf039330b8b5c760d789004ff6",
+      "arm": "19b8394996c07624fb3a3e6649cac9efb8838f7cbe29fffd9a9f22f40b992eb6",
+      "i686": "f6f610257acc86dcb4b890d3b43ff527bd587fe664b0857287cdad2c9dc6db00",
+      "x86_64": "c610fce8e09de700d8c7c005c6579f66bc64db19ecfe6190c1b41c42ee2c53c5"
     }
   }
 }
diff --git a/common-files/setup_toolchain_gcc.sh b/common-files/setup_toolchain_gcc.sh
index a4a97f7be..88ed04fb6 100644
--- a/common-files/setup_toolchain_gcc.sh
+++ b/common-files/setup_toolchain_gcc.sh
@@ -204,6 +204,8 @@ _setup_standalone_toolchain_current_ndk_newer_gcc() {
 		echo "INPUT(-lc++_shared)" > $GCC_STANDALONE_TOOLCHAIN_TMP/$TERMUX_HOST_PLATFORM/lib/libstdc++.so
 		echo "INPUT(-lc++_static -lc++abi)" > $GCC_STANDALONE_TOOLCHAIN_TMP/$TERMUX_HOST_PLATFORM/lib/libstdc++.a
 		mkdir -p $GCC_STANDALONE_TOOLCHAIN_TMP/include/c++/$GCC_VERSION
+		# Remove fix-includes
+		rm -rf $GCC_STANDALONE_TOOLCHAIN_TMP/lib/gcc/aarch64-linux-android/$GCC_VERSION/include-fixed
 		cp -R $GCC_STANDALONE_TOOLCHAIN_TMP/sysroot/usr/include/c++/v1/* $GCC_STANDALONE_TOOLCHAIN_TMP/include/c++/$GCC_VERSION
 		# See https://github.com/android/ndk/issues/215#issuecomment-524293090
 		sed -i "s/include_next <stddef.h>/include <stddef.h>/" $GCC_STANDALONE_TOOLCHAIN_TMP/include/c++/$GCC_VERSION/cstddef
@@ -214,7 +216,7 @@ _setup_standalone_toolchain_current_ndk_newer_gcc() {
 }
 
 _setup_toolchain_ndk_with_gfortran_11() {
-	local GCC_TOOLCHAIN_VERSION=1
+	local GCC_TOOLCHAIN_VERSION=0
 
     local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
 	local GCC_VERSION=$(jq -r '.["11"].version' $PREBUILT_GCC_JSON)
@@ -237,7 +239,7 @@ _setup_toolchain_ndk_with_gfortran_11() {
 }
 
 _setup_toolchain_ndk_gcc_11() {
-	local GCC_TOOLCHAIN_VERSION=1
+	local GCC_TOOLCHAIN_VERSION=0
 
     local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
 	local GCC_VERSION=$(jq -r '.["11"].version' $PREBUILT_GCC_JSON)
@@ -249,7 +251,7 @@ _setup_toolchain_ndk_gcc_11() {
 }
 
 _setup_toolchain_ndk_gcc_10() {
-	local GCC_TOOLCHAIN_VERSION=1
+	local GCC_TOOLCHAIN_VERSION=0
 
     local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
 	local GCC_VERSION=$(jq -r '.["10"].version' $PREBUILT_GCC_JSON)
@@ -261,7 +263,7 @@ _setup_toolchain_ndk_gcc_10() {
 }
 
 _setup_toolchain_ndk_gcc_9() {
-	local GCC_TOOLCHAIN_VERSION=1
+	local GCC_TOOLCHAIN_VERSION=0
 
     local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
 	local GCC_VERSION=$(jq -r '.["9"].version' $PREBUILT_GCC_JSON)
@@ -273,7 +275,7 @@ _setup_toolchain_ndk_gcc_9() {
 }
 
 _setup_toolchain_ndk_gcc_12() {
-	local GCC_TOOLCHAIN_VERSION=1
+	local GCC_TOOLCHAIN_VERSION=0
 
     local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
 	local GCC_VERSION=$(jq -r '.["12"].version' $PREBUILT_GCC_JSON)
@@ -285,7 +287,7 @@ _setup_toolchain_ndk_gcc_12() {
 }
 
 _setup_toolchain_ndk_gcc_13() {
-	local GCC_TOOLCHAIN_VERSION=1
+	local GCC_TOOLCHAIN_VERSION=0
 
     local PREBUILT_GCC_JSON="$TERMUX_SCRIPTDIR/common-files/prebuilt-gcc.json"
 	local GCC_VERSION=$(jq -r '.["13"].version' $PREBUILT_GCC_JSON)