Update to GCC 15.0.1

Author: Kartatz

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       id: check-cache
       uses: actions/cache@main
       with:
-        key: gcc-14.2.0
+        key: gcc-15.0.1-1
         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-14.2.0
+        key: gcc-15.0.1-1
         path: |
           /tmp/x86_64-linux-gnu.tar.xz
           /tmp/x86_64-linux-gnu.tar.xz.sha256
@@ -82,7 +82,7 @@ jobs:
     - name: Restore from cache
       uses: actions/cache@main
       with:
-        key: gcc-14.2.0
+        key: gcc-15.0.1-1
         fail-on-cache-miss: true
         path: |
           /tmp/x86_64-linux-gnu.tar.xz

build.sh

@@ -7,6 +7,7 @@ declare -r workdir="${PWD}"
 declare -r revision="$(git rev-parse --short HEAD)"
 
 declare -r toolchain_directory='/tmp/raiden'
+declare -r share_directory="${toolchain_directory}/usr/local/share/raiden"
 
 declare -r gmp_tarball='/tmp/gmp.tar.xz'
 declare -r gmp_directory='/tmp/gmp-6.3.0'
@@ -18,47 +19,17 @@ 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.43'
+declare -r binutils_directory='/tmp/binutils-with-gold-2.44'
 
-declare gcc_directory=''
+declare -r gcc_tarball='/tmp/gcc.tar.xz'
+declare -r gcc_directory='/tmp/gcc-master'
 
 declare -r sysroot_tarball='/tmp/sysroot.tar.xz'
 
-function setup_gcc_source() {
-	
-	local gcc_version=''
-	local gcc_url=''
-	local gcc_tarball=''
-	local tgt="${1}"
-	
-	declare -r tgt
-	
-	gcc_version='14'
-	gcc_directory='/tmp/gcc-14.2.0'
-	gcc_url='https://ftp.gnu.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz'
-	
-	gcc_tarball="/tmp/gcc-${gcc_version}.tar.xz"
-	
-	declare -r gcc_version
-	declare -r gcc_url
-	declare -r gcc_tarball
-	
-	if ! [ -f "${gcc_tarball}" ]; then
-		wget --no-verbose "${gcc_url}" --output-document="${gcc_tarball}"
-		tar --directory="$(dirname "${gcc_directory}")" --extract --file="${gcc_tarball}"
-	fi
-	
-	[ -d "${gcc_directory}/build" ] || mkdir "${gcc_directory}/build"
-	
-	sed --in-place 's/LDBL_MANT_DIG == 113/defined(__powerpc__) || defined(__powerpc64__) || defined(__s390x__)/g' "${gcc_directory}/libgcc/dfp-bit.h"
-	sed --in-place 's/soft-fp.h/this-does-not-exist.h/g' "${gcc_directory}/libquadmath/math/sqrtq.c"
-	
-}
-
-declare -r optflags='-Os'
+declare -r optflags='-w -Os'
 declare -r linkflags='-Wl,-s'
 
-declare -r max_jobs="$(($(nproc) * 17))"
+declare -r max_jobs="$(($(nproc) * 10))"
 
 declare build_type="${1}"
 
@@ -98,10 +69,24 @@ if ! [ -f "${mpc_tarball}" ]; then
 fi
 
 if ! [ -f "${binutils_tarball}" ]; then
-	wget --no-verbose 'https://ftp.gnu.org/gnu/binutils/binutils-2.43.tar.xz' --output-document="${binutils_tarball}"
+	wget --no-verbose 'https://ftp.gnu.org/gnu/binutils/binutils-with-gold-2.44.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"
+	patch --directory="${binutils_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Revert-gold-Use-char16_t-char32_t-instead-of-uint16_.patch"
+	patch --directory="${binutils_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Disable-annoying-linker-warnings.patch"
+fi
+
+if ! [ -f "${gcc_tarball}" ]; then
+	wget --no-verbose 'https://github.com/gcc-mirror/gcc/archive/refs/heads/master.tar.gz' --output-document="${gcc_tarball}"
+	tar --directory="$(dirname "${gcc_directory}")" --extract --file="${gcc_tarball}"
+	
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Fix-libgcc-build-on-arm.patch"
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Change-the-default-language-version-for-C-compilatio.patch"
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Turn-Wimplicit-int-back-into-an-warning.patch"
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Turn-Wint-conversion-back-into-an-warning.patch"
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/submodules/obggcc/patches/0001-Revert-GCC-change-about-turning-Wimplicit-function-d.patch"
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/0001-Fix-libgcc-build-on-musl.patch"
+	patch --directory="${gcc_directory}" --strip='1' --input="${workdir}/patches/0001-Fix-libquadmath-build-on-musl.patch"
 fi
 
 [ -d "${gmp_directory}/build" ] || mkdir "${gmp_directory}/build"
@@ -147,24 +132,21 @@ cd "${mpc_directory}/build"
 	--enable-shared \
 	--enable-static \
 	${cross_compile_flags} \
-	CFLAGS="${optflags} -fpermissive" \
+	CFLAGS="${optflags}" \
 	CXXFLAGS="${optflags}" \
 	LDFLAGS="${linkflags}"
 
 make all --jobs
 make install
 
 declare -ra targets=(
-	# 'powerpc-unknown-linux-musl'
-	's390x-unknown-linux-musl'
+	'arm-unknown-linux-musleabihf'
+	'armv7l-unknown-linux-musleabihf'
 	'powerpc64le-unknown-linux-musl'
-	# 'mips-unknown-linux-musl'
-	# 'mipsel-unknown-linux-musl'
+	's390x-unknown-linux-musl'
 	'mips64-unknown-linux-musl'
-	'armv7l-unknown-linux-musleabihf'
 	'x86_64-unknown-linux-musl'
 	'aarch64-unknown-linux-musl'
-	'arm-unknown-linux-musleabihf'
 	'riscv64-unknown-linux-musl'
 	'i386-unknown-linux-musl'
 )
@@ -210,8 +192,6 @@ for target in "${targets[@]}"; do
 	make all --jobs
 	make install
 
-	setup_gcc_source "${triplet}"
-	
 	[ -d "${gcc_directory}/build" ] || mkdir "${gcc_directory}/build"
 
 	cd "${gcc_directory}/build"
@@ -226,7 +206,7 @@ for target in "${targets[@]}"; do
 		--with-mpc="${toolchain_directory}" \
 		--with-mpfr="${toolchain_directory}" \
 		--with-bugurl='https://github.com/AmanoTeam/Raiden/issues' \
-		--with-pkgversion="Raiden v0.6-${revision}" \
+		--with-pkgversion="Raiden v0.7-${revision}" \
 		--with-sysroot="${toolchain_directory}/${triplet}" \
 		--with-gcc-major-version-only \
 		--with-native-system-header-dir='/include' \
@@ -241,14 +221,15 @@ for target in "${targets[@]}"; do
 		--enable-link-serialization='1' \
 		--enable-linker-build-id \
 		--enable-lto \
-		--enable-plugin \
 		--enable-shared \
 		--enable-threads='posix' \
 		--enable-ld \
 		--enable-gold \
 		--enable-languages='c,c++' \
-		--disable-gnu-unique-object \
+		--disable-plugin \
 		--disable-libsanitizer \
+		--disable-fixincludes \
+		--disable-gnu-unique-object \
 		--disable-symvers \
 		--disable-sjlj-exceptions \
 		--disable-target-libiberty \
@@ -264,7 +245,7 @@ for target in "${targets[@]}"; do
 		libat_cv_have_ifunc=no \
 		CFLAGS="${optflags}" \
 		CXXFLAGS="${optflags}" \
-		LDFLAGS="-Wl,-rpath-link,${OBGGCC_TOOLCHAIN}/${CROSS_COMPILE_TRIPLET}/lib ${linkflags}"
+		LDFLAGS="${linkflags}"
 
 	LD_LIBRARY_PATH="${toolchain_directory}/lib" PATH="${PATH}:${toolchain_directory}/bin" make \
 		CFLAGS_FOR_TARGET="${optflags} ${linkflags}" \
@@ -279,10 +260,11 @@ for target in "${targets[@]}"; do
 		ln --symbolic "../../bin/${triplet}-${name}" "${name}"
 	done
 
-	rm --recursive "${toolchain_directory}/share"
-	rm --recursive "${toolchain_directory}/lib/gcc/${triplet}/"*"/include-fixed"
-	
 	patchelf --add-rpath '$ORIGIN/../../../../lib' "${toolchain_directory}/libexec/gcc/${triplet}/"*"/cc1"
 	patchelf --add-rpath '$ORIGIN/../../../../lib' "${toolchain_directory}/libexec/gcc/${triplet}/"*"/cc1plus"
 	patchelf --add-rpath '$ORIGIN/../../../../lib' "${toolchain_directory}/libexec/gcc/${triplet}/"*"/lto1"
 done
+
+mkdir --parent "${share_directory}"
+
+cp --recursive "${workdir}/tools/dev/"* "${share_directory}"

build_all.sh

@@ -0,0 +1,25 @@
+From 8935150cb28bc218249ea11f17093d0f1a9c1311 Mon Sep 17 00:00:00 2001
+From: Kartatz <[email protected]>
+Date: Fri, 14 Feb 2025 02:05:07 +0100
+Subject: [PATCH] Fix libgcc build on musl
+
+---
+ libgcc/dfp-bit.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgcc/dfp-bit.h b/libgcc/dfp-bit.h
+index 0468ea1..cbc271b 100644
+--- a/libgcc/dfp-bit.h
++++ b/libgcc/dfp-bit.h
+@@ -288,7 +288,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ #elif LDBL_MANT_DIG == 113
+ #define BFP_FMT "%.36Le"
+ #else
+-#error "unknown long double size, cannot define BFP_FMT"
++#define BFP_FMT "%Le"
+ #endif /* LDBL_MANT_DIG */
+ #define STR_TO_BFP strtold
+ #define BFP_VIA_TYPE long double
+-- 
+2.36.6
+

mips-unknown-linux-musl.sh

@@ -0,0 +1,34 @@
+From f3a476cf1da06c99aa1dff09c4e8829a9b9db33c Mon Sep 17 00:00:00 2001
+From: Kartatz <[email protected]>
+Date: Fri, 14 Feb 2025 02:15:49 +0100
+Subject: [PATCH] Fix libquadmath build on musl
+
+---
+ libquadmath/math/sqrtq.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libquadmath/math/sqrtq.c b/libquadmath/math/sqrtq.c
+index a58998a..37e6392 100644
+--- a/libquadmath/math/sqrtq.c
++++ b/libquadmath/math/sqrtq.c
+@@ -1,7 +1,7 @@
+ #include "quadmath-imp.h"
+ #include <math.h>
+ #include <float.h>
+-#if __has_include("../../libgcc/soft-fp/soft-fp.h") \
++#if __has_include("../../libgcc/soft-fp/this-does-not-exist.h") \
+     && __has_include("../../libgcc/soft-fp/quad.h") \
+     && defined(FE_TONEAREST) \
+     && defined(FE_UPWARD) \
+@@ -12,7 +12,7 @@
+ #if defined(_ARCH_PPC) && !defined(__LONG_DOUBLE_IEEE128__)
+ #define TFtype __float128
+ #endif
+-#include "../../libgcc/soft-fp/soft-fp.h"
++#include "../../libgcc/soft-fp/this-does-not-exist.h"
+ #include "../../libgcc/soft-fp/quad.h"
+ #endif
+ 
+-- 
+2.36.6
+