From a46d26664c193e2f1ebca89d90f644c81dab4fd8 Mon Sep 17 00:00:00 2001
From: Shiz <hi@shiz.me>
Date: Wed, 3 Jan 2024 13:43:48 +0100
Subject: [PATCH] buildtoolchain: update to GCC 11.3 and binutils 2.39

---
 buildtoolchain/binutils-2.21.1.patch | 39 ----------------------------
 buildtoolchain/buildit.sh            | 28 +++++++++++---------
 2 files changed, 16 insertions(+), 51 deletions(-)
 delete mode 100644 buildtoolchain/binutils-2.21.1.patch

diff --git a/buildtoolchain/binutils-2.21.1.patch b/buildtoolchain/binutils-2.21.1.patch
deleted file mode 100644
index 165d044..0000000
--- a/buildtoolchain/binutils-2.21.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -burN '--exclude=.git' binutils-2.21.1/ld/emultempl/spuelf.em binutils-2.21.1-PS3/ld/emultempl/spuelf.em
---- binutils-2.21.1/ld/emultempl/spuelf.em	2009-08-10 04:50:56.000000000 -0300
-+++ binutils-2.21.1-PS3/ld/emultempl/spuelf.em	2011-05-25 10:15:21.220050910 -0300
-@@ -396,7 +396,11 @@
-   argv[my_argc++] = "-T";
-   argv[my_argc++] = auto_overlay_file;
-   argv[my_argc] = 0;
-+#if defined(_WIN32)
-+  execvp (argv[0], (const char* const*) argv);
-+#else
-   execvp (argv[0], (char *const *) argv);
-+#endif
-   perror (argv[0]);
-   _exit (127);
- }
-diff -burN '--exclude=.git' binutils-2.21.1/binutils/Makefile.am binutils-2.21.1-PS3/binutils/Makefile.am
---- binutils-2.21.1/binutils/Makefile.am	2011-07-06 13:27:16.000000000 +0200
-+++ binutils-2.21.1-PS3/binutils/Makefile.am	2011-07-06 13:28:06.000000000 +0200
-@@ -283,7 +283,7 @@
- 	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
- 
- embedspu: embedspu.sh Makefile
--	sed "/^program_transform_name=/cprogram_transform_name=$(program_transform_name)" < $< > $@
-+	awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
- 	chmod a+x $@
- 
- # We need these for parallel make.
-diff -burN '--exclude=.git' binutils-2.21.1/binutils/Makefile.in binutils-2.21.1-PS3/binutils/Makefile.in
---- binutils-2.21.1/binutils/Makefile.in	2011-07-06 13:27:23.000000000 +0200
-+++ binutils-2.21.1-PS3/binutils/Makefile.in	2011-07-06 13:28:35.000000000 +0200
-@@ -1295,7 +1295,7 @@
- 	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
- 
- embedspu: embedspu.sh Makefile
--	sed "/^program_transform_name=/cprogram_transform_name=$(program_transform_name)" < $< > $@
-+	awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
- 	chmod a+x $@
- 
- # We need these for parallel make.
diff --git a/buildtoolchain/buildit.sh b/buildtoolchain/buildit.sh
index d918ac1..cf0ef4e 100755
--- a/buildtoolchain/buildit.sh
+++ b/buildtoolchain/buildit.sh
@@ -8,29 +8,33 @@
 # Released under the terms of the GNU GPL, version 2
 SCRIPTDIR=`dirname $PWD/$0`
 
-BINUTILS_VER=2.21.1
+BINUTILS_VER=2.39
 BINUTILS_DIR="binutils-$BINUTILS_VER"
-BINUTILS_TARBALL="binutils-${BINUTILS_VER}a.tar.bz2"
+BINUTILS_TARBALL="binutils-${BINUTILS_VER}.tar.bz2"
 BINUTILS_URI="http://ftp.gnu.org/gnu/binutils/$BINUTILS_TARBALL"
 
-GMP_VER=4.3.2
+GMP_VER=6.2.1
 GMP_DIR="gmp-$GMP_VER"
 GMP_TARBALL="gmp-$GMP_VER.tar.bz2"
 GMP_URI="http://ftp.gnu.org/gnu/gmp/$GMP_TARBALL"
 
-MPFR_VER=2.4.2
+MPFR_VER=4.1.0
 MPFR_DIR="mpfr-$MPFR_VER"
 MPFR_TARBALL="mpfr-$MPFR_VER.tar.bz2"
 MPFR_URI="http://ftp.gnu.org/gnu/mpfr/$MPFR_TARBALL"
 
-GCC_VER=4.4.7
+MPC_VER=1.2.1
+MPC_DIR=mpc-$MPC_VER
+MPC_TARBALL="mpc-$MPC_VER.tar.gz"
+MPC_URI="http://ftp.gnu.org/gnu/mpc/$MPC_TARBALL"
+
+GCC_VER=11.3.0
 GCC_DIR="gcc-$GCC_VER"
-GCC_TARBALL="gcc-core-$GCC_VER.tar.bz2"
+GCC_TARBALL="gcc-$GCC_VER.tar.gz"
 GCC_URI="http://ftp.gnu.org/gnu/gcc/gcc-$GCC_VER/$GCC_TARBALL"
 
-
-ARM_TARGET=armeb-eabi
-POWERPC_TARGET=powerpc-elf
+ARM_TARGET=armeb-none-eabi
+POWERPC_TARGET=powerpc-none-elf
 
 if [ -z $MAKEOPTS ]; then
 	MAKEOPTS=-j3
@@ -86,6 +90,7 @@ prepsrc() {
 	download "$1/var/cache/$BINUTILS_TARBALL" "$BINUTILS_URI"
 	download "$1/var/cache/$GMP_TARBALL" "$GMP_URI"
 	download "$1/var/cache/$MPFR_TARBALL" "$MPFR_URI"
+	download "$1/var/cache/$MPC_TARBALL" "$MPC_URI"
 	download "$1/var/cache/$GCC_TARBALL" "$GCC_URI"
 
 	cleansrc "$1"
@@ -98,9 +103,8 @@ prepsrc() {
 	mv "$1/src/$GCC_DIR/$GMP_DIR" "$1/src/$GCC_DIR/gmp" || die "Error renaming $GMP_DIR -> gmp"
 	extract "$1/src/$GCC_DIR" "$1/var/cache/$MPFR_TARBALL"
 	mv "$1/src/$GCC_DIR/$MPFR_DIR" "$1/src/$GCC_DIR/mpfr" || die "Error renaming $MPFR_DIR -> mpfr"
-
-	# http://sourceware.org/bugzilla/show_bug.cgi?id=12964
-	patch -d $WIIDEV/$BINUTILS_DIR -u -p1 -i $SCRIPTDIR/binutils-2.21.1.patch || die "Error applying binutils patch"
+	extract "$1/src/$GCC_DIR" "$1/var/cache/$MPC_TARBALL"
+	mv "$1/src/$GCC_DIR/$MPC_DIR" "$1/src/$GCC_DIR/mpc" || die "Error renaming $MPC_DIR -> mpc"
 }
 
 buildbinutils() {