Update to GCC 14.2.0

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       id: check-cache
       uses: actions/cache@main
       with:
-        key: gcc-13.2.0
+        key: gcc-14.2.0
         lookup-only: true
         path: |
           /tmp/x86_64-linux-gnu.tar.xz
@@ -45,7 +45,7 @@ jobs:
       if: ${{ steps.check-cache.outputs.cache-hit != 'true' }}
       uses: actions/cache@main
       with:
-        key: gcc-13.2.0
+        key: gcc-14.2.0
         path: |
           /tmp/x86_64-linux-gnu.tar.xz
           /tmp/x86_64-linux-gnu.tar.xz.sha256
@@ -58,20 +58,22 @@ jobs:
     strategy:
       matrix:
         target: [
-          alpha-unknown-linux-gnu,
-          x86_64-unknown-linux-gnu,
-          i386-unknown-linux-gnu,
-          arm-unknown-linux-gnueabi,
-          arm-unknown-linux-gnueabihf,
-          hppa-unknown-linux-gnu,
-          aarch64-unknown-linux-gnu,
-          mips-unknown-linux-gnu,
-          mipsel-unknown-linux-gnu,
-          powerpc-unknown-linux-gnu,
-          s390-unknown-linux-gnu,
-          s390x-unknown-linux-gnu,
-          sparc-unknown-linux-gnu,
-          powerpc64le-unknown-linux-gnu
+          'ia64-unknown-linux-gnu',
+          'alpha-unknown-linux-gnu',
+          'x86_64-unknown-linux-gnu',
+          'i386-unknown-linux-gnu',
+          'arm-unknown-linux-gnueabi',
+          'arm-unknown-linux-gnueabihf',
+          'hppa-unknown-linux-gnu',
+          'aarch64-unknown-linux-gnu',
+          'mips-unknown-linux-gnu',
+          'mipsel-unknown-linux-gnu',
+          'powerpc-unknown-linux-gnu',
+          's390-unknown-linux-gnu',
+          's390x-unknown-linux-gnu',
+          'sparc-unknown-linux-gnu',
+          'powerpc64le-unknown-linux-gnu',
+          'mips64el-unknown-linux-gnuabi64'
         ]
     steps:
     - uses: actions/checkout@main
@@ -80,7 +82,7 @@ jobs:
     - name: Restore from cache
       uses: actions/cache@main
       with:
-        key: gcc-13.2.0
+        key: gcc-14.2.0
         fail-on-cache-miss: true
         path: |
           /tmp/x86_64-linux-gnu.tar.xz
@@ -91,18 +93,20 @@ jobs:
         mv '/tmp/sphynx' '/tmp/sphynx-toolchain'
     - name: Build Sphynx with OBGGCC
       run: |
-        source './submodules/obggcc/tools/setup_toolchain.sh'
         source './tools/setup_toolchain.sh'
+        source './submodules/obggcc/tools/setup_toolchain.sh'
         
         bash './build.sh' '${{ matrix.target }}'
     - name: Generate tarball
       run: |
-        declare tarball_filename='${{ matrix.target }}.tar.xz'
-        tar --directory='/tmp' --create --file=- 'sphynx' |  xz --threads=0 --compress -9 > "${tarball_filename}"
-        sha256sum "${tarball_filename}" > "${tarball_filename}.sha256"
+        declare tarball_filename='/tmp/${{ matrix.target }}.tar.xz'
+        tar --directory='/tmp' --create --file=- 'sphynx' | xz --threads='0' --compress -9 > "${tarball_filename}"
+        sha256sum "${tarball_filename}" | sed 's|/tmp/||' > "${tarball_filename}.sha256"
     - name: Upload artifact
       uses: actions/upload-artifact@main
       with:
+        name: ${{ matrix.target }}
+        if-no-files-found: error
         path: |
-          ${{ matrix.target }}.tar.xz
-          ${{ matrix.target }}.tar.xz.sha256
+          /tmp/${{ matrix.target }}.tar.xz
+          /tmp/${{ matrix.target }}.tar.xz.sha256

build.sh

@@ -2,30 +2,30 @@
 
 set -eu
 
-declare -r revision="$(git rev-parse --short HEAD)"
-
-declare -r current_source_directory="${PWD}"
+declare -r workdir="${PWD}"
 
-declare -r toolchain_directory='/tmp/sphynx'
+declare -r revision="$(git rev-parse --short HEAD)"
 
 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) * 17))"
+
 declare build_type="${1}"
 
 if [ -z "${build_type}" ]; then
@@ -49,30 +49,34 @@ if ! (( is_native )); then
 fi
 
 if ! [ -f "${gmp_tarball}" ]; then
-	wget --no-verbose 'https://mirrors.kernel.org/gnu/gmp/gmp-6.2.1.tar.xz' --output-document="${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
-	wget --no-verbose 'https://mirrors.kernel.org/gnu/mpfr/mpfr-4.2.0.tar.xz' --output-document="${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
-	wget --no-verbose 'https://mirrors.kernel.org/gnu/mpc/mpc-1.3.1.tar.gz' --output-document="${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
-	wget --no-verbose 'https://mirrors.kernel.org/gnu/binutils/binutils-2.41.tar.xz' --output-document="${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
-	wget --no-verbose 'https://mirrors.kernel.org/gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz' --output-document="${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}"
 fi
 
+declare -r toolchain_directory="/tmp/sphynx"
+
 [ -d "${gmp_directory}/build" ] || mkdir "${gmp_directory}/build"
 
 cd "${gmp_directory}/build"
@@ -154,7 +158,7 @@ declare -ra targets=(
 )
 
 for target in "${targets[@]}"; do
-	source "${current_source_directory}/${target}.sh"
+	source "${sphynx}/${target}.sh"
 
 	cd "$(mktemp --directory)"
 
@@ -287,7 +291,7 @@ for target in "${targets[@]}"; do
 		CXXFLAGS_FOR_TARGET="${optflags} ${linkflags}" \
 		gcc_cv_objdump="${CROSS_COMPILE_TRIPLET}-objdump" \
 		all \
-		--jobs="$(($(nproc) * 12))"
+		--jobs="${max_jobs}"
 	make install
 
 	cd "${toolchain_directory}/${triplet}/bin"

patches/0001-Revert-gold-Use-char16_t-char32_t-instead-of-uint16_.patch

@@ -0,0 +1,77 @@
+From c5fcba3bc2b47e1061e066deac04efbbdb53362d Mon Sep 17 00:00:00 2001
+From: Kartatz <[email protected]>
+Date: Wed, 8 May 2024 07:04:54 +0200
+Subject: [PATCH] Revert "gold: Use char16_t, char32_t instead of uint16_t,
+ uint32_t as character types"
+
+This reverts commit 5e9091dab8858b25210a91d22fbbbfdee9c969ad.
+---
+diff --git a/gold/merge.cc b/gold/merge.cc
+index ca15149c767..55de3013a1b 100644
+--- a/gold/merge.cc
++++ b/gold/merge.cc
+@@ -665,10 +665,10 @@ template
+ class Output_merge_string<char>;
+
+ template
+-class Output_merge_string<char16_t>;
++class Output_merge_string<uint16_t>;
+
+ template
+-class Output_merge_string<char32_t>;
++class Output_merge_string<uint32_t>;
+
+ #if defined(HAVE_TARGET_32_LITTLE) || defined(HAVE_TARGET_32_BIG)
+ template
+diff --git a/gold/output.cc b/gold/output.cc
+index ead67f20363..3375d322506 100644
+--- a/gold/output.cc
++++ b/gold/output.cc
+@@ -29,7 +29,6 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <algorithm>
+-#include <uchar.h>
+
+ #ifdef HAVE_SYS_MMAN_H
+ #include <sys/mman.h>
+@@ -2707,10 +2706,10 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx,
+ 	      pomb = new Output_merge_string<char>(addralign);
+ 	      break;
+ 	    case 2:
+-	      pomb = new Output_merge_string<char16_t>(addralign);
++	      pomb = new Output_merge_string<uint16_t>(addralign);
+ 	      break;
+ 	    case 4:
+-	      pomb = new Output_merge_string<char32_t>(addralign);
++	      pomb = new Output_merge_string<uint32_t>(addralign);
+ 	      break;
+ 	    default:
+ 	      return false;
+diff --git a/gold/stringpool.cc b/gold/stringpool.cc
+index d8f38cfabc1..2e4a746d1a8 100644
+--- a/gold/stringpool.cc
++++ b/gold/stringpool.cc
+@@ -25,7 +25,6 @@
+ #include <cstring>
+ #include <algorithm>
+ #include <vector>
+-#include <uchar.h>
+
+ #include "output.h"
+ #include "parameters.h"
+@@ -528,9 +527,9 @@ template
+ class Stringpool_template<char>;
+
+ template
+-class Stringpool_template<char16_t>;
++class Stringpool_template<uint16_t>;
+
+ template
+-class Stringpool_template<char32_t>;
++class Stringpool_template<uint32_t>;
+
+ } // End namespace gold.
+-- 
+2.36.6
+