From 1046606ae29b2faa6354f41a5ea941c673a35fa5 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@iinet.net.au>
Date: Tue, 9 May 2023 19:09:34 +1000
Subject: [PATCH] complete gcc / binutils update

---
 Makefile          |  2 +-
 make_toolchain.sh | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 2d7f686..18697e6 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ kernel.o:loader.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o kernel.o -c kernel.c
 
 kernel.bin:kernel.o serial.o console.o gdt.o interrupts.o string.o memory.o malloc.o io.o keyboard.o ramdisk.o vfs.o pci.o schedule.o timer.o syscalls.o tty_fs.o execve.o rtc.o pata.o hd.o gui.o mouse.o fpu.o i825xx.o ether.o arp.o ipv4.o icmp.o socket.o tcp.o hashmap.o minix.o udp.o virtnet.o virtio.o ahci.o pvec.o font.o 
-	$(LD) -T linker.ld -o kernel.bin loader.o kernel.o console.o gdt.o interrupts.o string.o memory.o malloc.o io.o keyboard.o ramdisk.o vfs.o pci.o schedule.o timer.o syscalls.o tty_fs.o execve.o rtc.o pata.o hd.o gui.o mouse.o fpu.o i825xx.o ether.o arp.o ipv4.o icmp.o socket.o tcp.o hashmap.o minix.o udp.o serial.o virtnet.o virtio.o ahci.o pvec.o font.o $(HOME)/Quinn/cross/lib/gcc/i686-elf/10.2.0/libgcc.a
+	$(LD) -T linker.ld -o kernel.bin loader.o kernel.o console.o gdt.o interrupts.o string.o memory.o malloc.o io.o keyboard.o ramdisk.o vfs.o pci.o schedule.o timer.o syscalls.o tty_fs.o execve.o rtc.o pata.o hd.o gui.o mouse.o fpu.o i825xx.o ether.o arp.o ipv4.o icmp.o socket.o tcp.o hashmap.o minix.o udp.o serial.o virtnet.o virtio.o ahci.o pvec.o font.o $(HOME)/Quinn/cross/lib/gcc/i686-elf/13.1.0/libgcc.a
 
 clean:
 	rm -f loader.o kernel.o kernel.bin kernel.img console.o gdt.o interrupts.o string.o memory.o malloc.o io.o keyboard.o ramdisk.o vfs.o pci.o schedule.o timer.o syscalls.o tty_fs.o execve.o rtc.o pata.o hd.o gui.o mouse.o fpu.o i825xx.o ether.o arp.o ipv4.o icmp.o socket.o tcp.o hashmap.o minix.o udp.o serial.o virtnet.o virtio.o ahci.o pvec.o font.o 
diff --git a/make_toolchain.sh b/make_toolchain.sh
index e4de968..f99383c 100755
--- a/make_toolchain.sh
+++ b/make_toolchain.sh
@@ -17,8 +17,8 @@ cd $HOME/Quinn/tools
 echo "Fetching Tools"
 
 wget ftp://sourceware.org/pub/newlib/newlib-4.1.0.tar.gz
-wget ftp://ftp.gnu.org/gnu/binutils/binutils-2.35.1.tar.xz
-wget ftp://ftp.gnu.org/gnu/gcc/gcc-10.2.0/gcc-10.2.0.tar.xz
+wget ftp://ftp.gnu.org/gnu/binutils/binutils-2.40.tar.xz
+wget ftp://ftp.gnu.org/gnu/gcc/gcc-13.1.0/gcc-13.1.0.tar.xz
 
 echo "Fetching Quinn"
 
@@ -28,11 +28,11 @@ cd $HOME/Quinn/tools
 
 echo "Building Tools"
 
-tar xf binutils-2.35.1.tar.xz
+tar xf binutils-2.40.tar.xz
 mkdir binutils-build
 cd binutils-build
 
-../binutils-2.35.1/configure --target=i686-elf --prefix=$HOME/Quinn/cross --with-sysroot --disable-nls --disable-werror
+../binutils-2.40/configure --target=i686-elf --prefix=$HOME/Quinn/cross --with-sysroot --disable-nls --disable-werror
 make
 make install
 
@@ -40,16 +40,16 @@ cd ..
 
 export PATH=$HOME/Quinn/cross/bin:$PATH
 
-tar xf gcc-10.2.0.tar.xz
+tar xf gcc-13.1.0.tar.xz
 
-cd gcc-10.2.0
+cd gcc-13.1.0
 contrib/download_prerequisites
 cd ..
 
 mkdir gcc-build
 cd gcc-build
 
-../gcc-10.2.0/configure --target=i686-elf --prefix=$HOME/Quinn/cross --disable-nls --enable-languages=c,c++ --without-headers
+../gcc-13.1.0/configure --target=i686-elf --prefix=$HOME/Quinn/cross --disable-nls --enable-languages=c,c++ --without-headers
 make all-gcc
 make install-gcc
 make all-target-libgcc
@@ -72,28 +72,28 @@ mkdir $HOME/Quinn/sysroot/usr
 
 cp -r newlib-4.1.0/newlib/libc/include $HOME/Quinn/sysroot/usr
 
-cd binutils-2.35.1
-patch -p1 < $HOME/Quinn/src/quinn-os/binutils-2.35.1.diff
+cd binutils-2.40
+patch -p1 < $HOME/Quinn/src/quinn-os/binutils-2.40.diff
 cd ..
 
 mkdir binutils-build
 cd binutils-build
-../binutils-2.35.1/configure --target=i686-quinn --prefix=$HOME/Quinn/cross --with-sysroot=$HOME/Quinn/sysroot --disable-nls --disable-werror
+../binutils-2.40/configure --target=i686-quinn --prefix=$HOME/Quinn/cross --with-sysroot=$HOME/Quinn/sysroot --disable-nls --disable-werror
 make
 make install
 
 cd ..
 rm -rf binutils-build
 
-cd gcc-10.2.0
-patch -p1 < $HOME/Quinn/src/quinn-os/gcc-10.2.0.diff
+cd gcc-13.1.0
+patch -p1 < $HOME/Quinn/src/quinn-os/gcc-13.1.0.diff
 cd ..
 
 mkdir gcc-build
 
 cd gcc-build
 
-../gcc-10.2.0/configure --target=i686-quinn --prefix=$HOME/Quinn/cross --disable-nls --enable-languages=c,c++ --with-sysroot=$HOME/Quinn/sysroot --with-newlib
+../gcc-13.1.0/configure --target=i686-quinn --prefix=$HOME/Quinn/cross --disable-nls --enable-languages=c,c++ --with-sysroot=$HOME/Quinn/sysroot --with-newlib
 make all-gcc
 make install-gcc
 make all-target-libgcc