From 9025a85bccee693bb0f3b421209e2d60a9f4d3f6 Mon Sep 17 00:00:00 2001
From: Rafal Kupiec <belliash@codingworkshop.eu.org>
Date: Wed, 15 May 2024 21:14:53 +0200
Subject: [PATCH] Update software and get rid of binutils

---
 build-linux.sh                                | 63 ++-----------------
 .../2_41/001-add-arm-architectures.patch      | 30 ---------
 .../001-add-xtc-version-suffix.patch          |  0
 3 files changed, 4 insertions(+), 89 deletions(-)
 delete mode 100644 patches/binutils/2_41/001-add-arm-architectures.patch
 rename patches/cmake/{v3.27.6 => v3.29.3}/001-add-xtc-version-suffix.patch (100%)

diff --git a/build-linux.sh b/build-linux.sh
index 5afb807..485d00b 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -16,19 +16,14 @@ WRKDIR="$(pwd)"
 ARCHS="aarch64 armv7 i686 x86_64"
 GENERIC="generic-w64-mingw32"
 
-# Binutils Settings
-BINUTILSDIR="${SRCDIR}/binutils"
-BINUTILSTAG="binutils-2_41"
-BINUTILSVCS="git://sourceware.org/git/binutils-gdb.git"
-
 # CMake Settings
 CMAKEDIR="${SRCDIR}/cmake"
-CMAKETAG="v3.27.6"
+CMAKETAG="v3.29.3"
 CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
 
 # LLVM Settings
 LLVMDIR="${SRCDIR}/llvm"
-LLVMTAG="llvmorg-18.1.4"
+LLVMTAG="llvmorg-18.1.5"
 LLVMVCS="https://github.com/llvm/llvm-project.git"
 
 # Make Settings
@@ -45,12 +40,12 @@ MINGWVCS="https://github.com/mirror/mingw-w64.git"
 
 # Ninja Settings
 NINJADIR="${SRCDIR}/ninja"
-NINJATAG="v1.11.1"
+NINJATAG="v1.12.1"
 NINJAVCS="https://github.com/ninja-build/ninja.git"
 
 # Wine Settings
 WINEDIR="${SRCDIR}/wine"
-WINETAG="wine-8.17"
+WINETAG="wine-9.8"
 WINEVCS="git://source.winehq.org/git/wine.git"
 
 
@@ -79,50 +74,6 @@ apply_patches()
     fi
 }
 
-# This function compiles and installs GNU BINUTILS
-binutils_build()
-{
-    echo ">>> Building BINUTILS ..."
-    for ARCH in ${ARCHS}; do
-        [ -z ${CLEAN} ] || rm -rf ${BINUTILSDIR}/build-${ARCH}
-        mkdir -p ${BINUTILSDIR}/build-${ARCH}
-        cd ${BINUTILSDIR}/build-${ARCH}
-        case ${ARCH} in
-            "armv7")
-                TARGET="arm"
-                ;;
-            *)
-                TARGET="${ARCH}"
-                ;;
-        esac
-        ../configure \
-            --target=${TARGET}-w64-mingw32 \
-            --disable-binutils \
-            --disable-gdb \
-            --disable-gprof \
-            --disable-ld \
-            --disable-multilib \
-            --disable-nls \
-            --disable-werror \
-            --with-zlib=yes
-        make -j${CORES}
-        cp ${BINUTILSDIR}/build-${ARCH}/gas/as-new ${BINDIR}/bin/${ARCH}-w64-mingw32-gas
-    done
-    cd ${WRKDIR}
-}
-
-# This function downloads GNU BINUTILS from VCS
-binutils_fetch()
-{
-    if [ ! -d ${BINUTILSDIR} ]; then
-        echo ">>> Downloading BINUTILS ..."
-        git clone --depth 1 --branch ${BINUTILSTAG} ${BINUTILSVCS} ${BINUTILSDIR}
-        cd ${BINUTILSDIR}
-        apply_patches ${BINUTILSDIR##*/} ${BINUTILSTAG##*-}
-        cd ${WRKDIR}
-    fi
-}
-
 # This function compiles and installs CMAKE
 cmake_build()
 {
@@ -575,12 +526,6 @@ mingw_build_libs
 # Build and install Mingw-W64 tools
 mingw_build_tools
 
-# Download Binutils
-binutils_fetch
-
-# Build and install Binutils
-binutils_build
-
 # Download Wine
 wine_fetch
 
diff --git a/patches/binutils/2_41/001-add-arm-architectures.patch b/patches/binutils/2_41/001-add-arm-architectures.patch
deleted file mode 100644
index 5f253fc..0000000
--- a/patches/binutils/2_41/001-add-arm-architectures.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/bfd/config.bfd b/bfd/config.bfd
-index bdee53957c0..04fff6e7df4 100644
---- a/bfd/config.bfd
-+++ b/bfd/config.bfd
-@@ -407,6 +407,12 @@ case "${targ}" in
-     targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
-     targ_underscore=yes
-     ;;
-+  arm-*-mingw*)
-+    targ_defvec=arm_pe_le_vec
-+    targ_selvecs="arm_pe_le_vec arm_pe_be_vec arm_pei_le_vec arm_pei_be_vec"
-+    targ_underscore=no
-+    targ_cflags="-DARM_COFF_BUGFIX"
-+    ;;
-   arm-*-phoenix*)
-     targ_defvec=arm_elf32_le_vec
-     targ_selvecs=arm_elf32_be_vec
-diff --git a/gas/configure.tgt b/gas/configure.tgt
-index 3429f850d05..fa735da7ce6 100644
---- a/gas/configure.tgt
-+++ b/gas/configure.tgt
-@@ -164,7 +164,7 @@ case ${generic_target} in
-   arm-*-nto*)				fmt=elf ;;
-   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
- 					fmt=coff em=wince-pe ;;
--  arm-*-pe)				fmt=coff em=pe ;;
-+  arm-*-pe | arm-*-mingw*)	fmt=coff em=pe ;;
-   arm-*-fuchsia*)			fmt=elf ;;
-   arm-*-haiku*)				fmt=elf em=haiku ;;
- 
diff --git a/patches/cmake/v3.27.6/001-add-xtc-version-suffix.patch b/patches/cmake/v3.29.3/001-add-xtc-version-suffix.patch
similarity index 100%
rename from patches/cmake/v3.27.6/001-add-xtc-version-suffix.patch
rename to patches/cmake/v3.29.3/001-add-xtc-version-suffix.patch