From 9b8f611af4898c854f91dc1158e02f3a7bf48f94 Mon Sep 17 00:00:00 2001
From: Flavio Cruz <flaviocruz@gmail.com>
Date: Thu, 5 Sep 2024 00:17:14 -0400
Subject: [PATCH] Bump binutils & gcc

---
 download-funcs.sh   | 9 ---------
 download.sh         | 2 +-
 package-versions.sh | 9 +++++++--
 vars.sh             | 2 --
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/download-funcs.sh b/download-funcs.sh
index 1f392a4e..509654f3 100644
--- a/download-funcs.sh
+++ b/download-funcs.sh
@@ -3,7 +3,6 @@
 . ./config.sh
 
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$BINUTILS_PKG
-GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-"$GCC_VERSION"/"$GCC_PKG"
 FLEX_URL=https://github.com/westes/flex/releases/download/v$FLEX_VERSION/$FLEX_PKG
 ZLIB_URL=http://zlib.net/"$ZLIB_PKG"
 BZIP2_URL=https://sourceware.org/pub/bzip2/$BZIP2_PKG
@@ -181,14 +180,6 @@ download_glibc() {
         cd ..
 }
 
-download_gcc() {
-    download $GCC_PKG $GCC_URL &&
-        if [ -d "$GCC_SRC" ]; then
-            return 0
-        fi
-    unpack zxf $GCC_PKG $GCC_SRC
-}
-
 download_sed() {
     download $SED_PKG $SED_URL &&
         if [ -d "$SED_SRC" ]; then
diff --git a/download.sh b/download.sh
index 2a9b2311..af1750a5 100755
--- a/download.sh
+++ b/download.sh
@@ -5,7 +5,7 @@
 
 mkdir -p $SOURCE &&
     pushd $SOURCE &&
-    download_gcc &&
+    download_package $GCC_URL &&
     download_package $BINUTILS_URL &&
     download $FLEX_PKG $FLEX_URL &&
     unpack zxf $FLEX_PKG $FLEX_SRC &&
diff --git a/package-versions.sh b/package-versions.sh
index 35dda60d..4a735972 100644
--- a/package-versions.sh
+++ b/package-versions.sh
@@ -1,5 +1,4 @@
 # Package versions.
-GCC_VERSION=14.1.0
 FLEX_VERSION=2.6.4
 ZLIB_VERSION=1.3.1
 BZIP2_VERSION=1.0.8
@@ -107,11 +106,17 @@ GCRYPT_PKG=$GCRYPT_SRC.tar.bz2
 GCRYPT_URL=https://gnupg.org/ftp/gcrypt/libgcrypt/$GCRYPT_PKG
 
 # binutils
-BINUTILS_VERSION=2.41
+BINUTILS_VERSION=2.43
 BINUTILS_SRC=binutils-$BINUTILS_VERSION
 BINUTILS_PKG=$BINUTILS_SRC.tar.bz2
 BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/$BINUTILS_PKG
 
+# GCC
+GCC_VERSION=14.2.0
+GCC_SRC=gcc-$GCC_VERSION
+GCC_PKG=$GCC_SRC.tar.xz
+GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-$GCC_VERSION/$GCC_PKG
+
 # libtirpc
 LIBTIRPC_VERSION=1.3.4
 LIBTIRPC_SRC=libtirpc-$LIBTIRPC_VERSION
diff --git a/vars.sh b/vars.sh
index 1f6c9f5a..ef38007d 100644
--- a/vars.sh
+++ b/vars.sh
@@ -17,8 +17,6 @@ fi
 
 . ./package-versions.sh
 
-GCC_SRC=gcc-"$GCC_VERSION"
-GCC_PKG="$GCC_SRC".tar.gz
 GNUMACH_SRC=gnumach
 GNUMIG_SRC=mig
 HURD_SRC=hurd