From ba6367478a0e86cf6001b1507e43fd72a1be0629 Mon Sep 17 00:00:00 2001
From: Kartatz <105828205+Kartatz@users.noreply.github.com>
Date: Mon, 12 Aug 2024 20:47:09 -0300
Subject: [PATCH] Update to GCC 14.2.0

---
 .github/workflows/build.yml       | 38 ++++++++++++++++++++++++++-----
 arm-remarkable-linux-gnueabihf.sh |  3 ++-
 build.sh                          | 32 ++++++++++++++------------
 submodules/obggcc                 |  2 +-
 4 files changed, 53 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 26deac8..7ff5b61 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,15 +13,27 @@ jobs:
     - uses: actions/checkout@main
       with:
         submodules: true
+    - name: Check for cache
+      id: check-cache
+      uses: actions/cache@main
+      with:
+        key: gcc-14.2.0
+        lookup-only: true
+        path: |
+          /tmp/x86_64-linux-gnu.tar.xz
+          /tmp/x86_64-linux-gnu.tar.xz.sha256
     - name: Build Nan
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
       run: |
         bash './build.sh' 'native'
     - name: Generate tarball
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
       run: |
         declare tarball_filename='/tmp/x86_64-linux-gnu.tar.xz'
         tar --directory='/tmp' --create --file=- 'nan' | xz --threads='0' --compress -9 > "${tarball_filename}"
         sha256sum "${tarball_filename}" | sed 's|/tmp/||' > "${tarball_filename}.sha256"
     - name: Upload artifact
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
       uses: actions/upload-artifact@main
       with:
         name: native-toolchain
@@ -29,6 +41,14 @@ jobs:
         path: |
           /tmp/x86_64-linux-gnu.tar.xz
           /tmp/x86_64-linux-gnu.tar.xz.sha256
+    - name: Cache artifact
+      if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
+      uses: actions/cache@main
+      with:
+        key: gcc-14.2.0
+        path: |
+          /tmp/x86_64-linux-gnu.tar.xz
+          /tmp/x86_64-linux-gnu.tar.xz.sha256
   
   cross-build:
     name: 'Cross build'
@@ -38,6 +58,7 @@ jobs:
     strategy:
       matrix:
         target: [
+          'ia64-unknown-linux-gnu',
           'alpha-unknown-linux-gnu',
           'x86_64-unknown-linux-gnu',
           'i386-unknown-linux-gnu',
@@ -51,19 +72,24 @@ jobs:
           's390-unknown-linux-gnu',
           's390x-unknown-linux-gnu',
           'sparc-unknown-linux-gnu',
-          'powerpc64le-unknown-linux-gnu'
+          'powerpc64le-unknown-linux-gnu',
+          'mips64el-unknown-linux-gnuabi64'
         ]
     steps:
     - uses: actions/checkout@main
       with:
         submodules: true
-    - name: Download artifact
-      uses: actions/download-artifact@main
+    - name: Restore from cache
+      uses: actions/cache@main
       with:
-        name: native-toolchain
+        key: gcc-14.2.0
+        fail-on-cache-miss: true
+        path: |
+          /tmp/x86_64-linux-gnu.tar.xz
+          /tmp/x86_64-linux-gnu.tar.xz.sha256
     - name: Setup toolchain
       run: |
-        tar --directory='/tmp' --extract --file='./x86_64-linux-gnu.tar.xz'
+        tar --directory='/tmp' --extract --file='/tmp/x86_64-linux-gnu.tar.xz'
         mv '/tmp/nan' '/tmp/nan-toolchain'
     - name: Build Nan with OBGGCC
       run: |
@@ -79,7 +105,7 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@main
       with:
-        name: cross-toolchain
+        name: ${{ matrix.target }}
         if-no-files-found: error
         path: |
           /tmp/${{ matrix.target }}.tar.xz
diff --git a/arm-remarkable-linux-gnueabihf.sh b/arm-remarkable-linux-gnueabihf.sh
index 4d5fe3a..7a27aa2 100644
--- a/arm-remarkable-linux-gnueabihf.sh
+++ b/arm-remarkable-linux-gnueabihf.sh
@@ -4,4 +4,5 @@ declare extra_configure_flags='--with-cpu=cortex-a9 --with-fpu=neon --with-float
 
 declare triplet='arm-remarkable-linux-gnueabihf'
 
-declare sysroot='https://web.archive.org/web/0if_/https://github.com/koreader/koxtoolchain/releases/latest/download/remarkable.zip'
+# https://web.archive.org/web/0if_/https://github.com/koreader/koxtoolchain/releases/latest/download/remarkable.zip
+declare sysroot='https://github.com/koreader/koxtoolchain/releases/latest/download/remarkable.zip'
diff --git a/build.sh b/build.sh
index 7aaf5fe..ebe9525 100644
--- a/build.sh
+++ b/build.sh
@@ -2,31 +2,29 @@
 
 set -eu
 
-declare -r current_source_directory="${PWD}"
+declare -r workdir="${PWD}"
 
 declare -r revision="$(git rev-parse --short HEAD)"
 
-declare -r toolchain_directory='/tmp/nan'
-
 declare -r gmp_tarball='/tmp/gmp.tar.xz'
-declare -r gmp_directory='/tmp/gmp-6.2.1'
+declare -r gmp_directory='/tmp/gmp-6.3.0'
 
 declare -r mpfr_tarball='/tmp/mpfr.tar.xz'
-declare -r mpfr_directory='/tmp/mpfr-4.2.0'
+declare -r mpfr_directory='/tmp/mpfr-4.2.1'
 
 declare -r mpc_tarball='/tmp/mpc.tar.gz'
 declare -r mpc_directory='/tmp/mpc-1.3.1'
 
 declare -r binutils_tarball='/tmp/binutils.tar.xz'
-declare -r binutils_directory='/tmp/binutils-2.41'
+declare -r binutils_directory='/tmp/binutils-2.43'
 
-declare -r gcc_tarball='/tmp/gcc.tar.gz'
-declare -r gcc_directory='/tmp/gcc-13.2.0'
+declare -r gcc_tarball='/tmp/gcc.tar.xz'
+declare -r gcc_directory='/tmp/gcc-14.2.0'
 
 declare -r optflags='-Os'
 declare -r linkflags='-Wl,-s'
 
-declare -r max_jobs="$(($(nproc) * 8))"
+declare -r max_jobs="$(($(nproc) * 17))"
 
 declare build_type="${1}"
 
@@ -51,30 +49,36 @@ if ! (( is_native )); then
 fi
 
 if ! [ -f "${gmp_tarball}" ]; then
-	curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://mirrors.kernel.org/gnu/gmp/gmp-6.2.1.tar.xz' --output "${gmp_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz' --output-document="${gmp_tarball}"
 	tar --directory="$(dirname "${gmp_directory}")" --extract --file="${gmp_tarball}"
 fi
 
 if ! [ -f "${mpfr_tarball}" ]; then
-	curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://mirrors.kernel.org/gnu/mpfr/mpfr-4.2.0.tar.xz' --output "${mpfr_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.xz' --output-document="${mpfr_tarball}"
 	tar --directory="$(dirname "${mpfr_directory}")" --extract --file="${mpfr_tarball}"
 fi
 
 if ! [ -f "${mpc_tarball}" ]; then
-	curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://mirrors.kernel.org/gnu/mpc/mpc-1.3.1.tar.gz' --output "${mpc_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz' --output-document="${mpc_tarball}"
 	tar --directory="$(dirname "${mpc_directory}")" --extract --file="${mpc_tarball}"
 fi
 
 if ! [ -f "${binutils_tarball}" ]; then
-	curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://mirrors.kernel.org/gnu/binutils/binutils-2.41.tar.xz' --output "${binutils_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/binutils/binutils-2.43.tar.xz' --output-document="${binutils_tarball}"
 	tar --directory="$(dirname "${binutils_directory}")" --extract --file="${binutils_tarball}"
+	
+	patch --directory="${binutils_directory}" --strip='1' --input="${workdir}/patches/0001-Revert-gold-Use-char16_t-char32_t-instead-of-uint16_.patch"
 fi
 
 if ! [ -f "${gcc_tarball}" ]; then
-	curl --connect-timeout '10' --retry '15' --retry-all-errors --fail --silent --url 'https://mirrors.kernel.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz' --output "${gcc_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz' --output-document="${gcc_tarball}"
 	tar --directory="$(dirname "${gcc_directory}")" --extract --file="${gcc_tarball}"
+	
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/0001-Revert-GCC-change-about-turning-Wimplicit-function-d.patch"
 fi
 
+declare -r toolchain_directory='/tmp/nan'
+
 [ -d "${gmp_directory}/build" ] || mkdir "${gmp_directory}/build"
 
 cd "${gmp_directory}/build"
diff --git a/submodules/obggcc b/submodules/obggcc
index 9499bd3..335914a 160000
--- a/submodules/obggcc
+++ b/submodules/obggcc
@@ -1 +1 @@
-Subproject commit 9499bd3eeb8a005cbea5c22c1c839f79e2f34e25
+Subproject commit 335914a684c154b99bf894cce96e7786c9733e39