From 9859266ad571e9f06098b977e645d08ff928d9ab Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Tue, 1 Sep 2020 00:14:10 +1000
Subject: [PATCH 1/2] Update arm-none-eabi-binutils to 2.35

---
 mingw-w64-arm-none-eabi-binutils/PKGBUILD | 65 +++++++++++++----------
 1 file changed, 36 insertions(+), 29 deletions(-)

diff --git a/mingw-w64-arm-none-eabi-binutils/PKGBUILD b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
index a018ad95bf..002608cbe2 100644
--- a/mingw-w64-arm-none-eabi-binutils/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: Carlos Antunes <cmantunes@gmail.com>
+# Maintainer: fauxpark <fauxpark@gmail.com>
 # Contributed by: nanodude
 
 _realname=binutils
@@ -6,44 +7,50 @@ _target=arm-none-eabi
 
 pkgbase=mingw-w64-${_target}-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_target}-${_realname}")
-pkgver=2.24
+pkgver=2.35
 pkgrel=1
-pkgdesc="GNU Tools for ARM Embedded Processors - Binutils (mingw-w64)"
+pkgdesc='GNU Tools for ARM Embedded Processors - Binutils (mingw-w64)'
 arch=('any')
-url="https://www.gnu.org/software/binutils/"
 license=('GPL')
+url='https://www.gnu.org/software/binutils/binutils.html'
 groups=("${MINGW_PACKAGE_PREFIX}-${_target}-toolchain")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
 options=('staticlibs')
-source=("https://mirrors.kernel.org/sources.redhat.com/${_realname}/releases/${_realname}-${pkgver}.tar.bz2")
-sha256sums=('e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137')
+source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.xz")
+sha256sums=('1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85')
+
+prepare() {
+    cd ${srcdir}/binutils-${pkgver}
+
+    mkdir binutils-build
+}
 
 build() {
-  if check_option "debug" "y"; then
-    CFLAGS+=" -g -O0"
-  fi
-  cd $srcdir
-  rm -rf build-${MINGW_CHOST}
-  mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
-  ../${_realname}-${pkgver}/configure \
-    --build="${MINGW_CHOST}" \
-    --host="${MINGW_CHOST}" \
-    --target="${_target}" \
-    --prefix="${MINGW_PREFIX}" \
-    --disable-werror \
-    --disable-lto \
-    --with-sysroot="${MINGW_PREFIX}" \
-    --disable-nls \
-    --disable-rpath \
-    --enable-multilib \
-    --enable-interwork
-  make
+    cd ${srcdir}/binutils-${pkgver}/binutils-build
+
+    ../configure \
+        --build=${MINGW_CHOST} \
+        --prefix=${MINGW_PREFIX} \
+        --target=${_target} \
+        --enable-multilib \
+        --enable-interwork \
+        --with-gnu-as \
+        --with-gnu-ld \
+        --disable-nls \
+        --enable-ld=default \
+        --enable-gold \
+        --enable-plugins \
+        --enable-deterministic-archives
+    make
 }
 
 package() {
-  cd ${srcdir}/build-${MINGW_CHOST}
-  make DESTDIR=${pkgdir} install
+    cd ${srcdir}/binutils-${pkgver}/binutils-build
 
-  # Remove unwanted files
-  rm -rf ${pkgdir}${MINGW_PREFIX}/share/info
+    make DESTDIR="${pkgdir}" install
+
+    cd ${pkgdir}${MINGW_PREFIX}
+
+    for info in as bfd binutils gprof ld; do
+      mv share/info/${info}.info share/info/arm-none-eabi-${info}.info
+    done
 }

From 72c475586523dbbe37a9373fa579b5f7d28bb949 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Tue, 1 Sep 2020 01:10:08 +1000
Subject: [PATCH 2/2] Append CHOST to build dir

---
 mingw-w64-arm-none-eabi-binutils/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-arm-none-eabi-binutils/PKGBUILD b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
index 002608cbe2..047c9c564f 100644
--- a/mingw-w64-arm-none-eabi-binutils/PKGBUILD
+++ b/mingw-w64-arm-none-eabi-binutils/PKGBUILD
@@ -21,11 +21,11 @@ sha256sums=('1b11659fb49e20e18db460d44485f09442c8c56d5df165de9461eb09c8302f85')
 prepare() {
     cd ${srcdir}/binutils-${pkgver}
 
-    mkdir binutils-build
+    mkdir binutils-build-${MINGW_CHOST}
 }
 
 build() {
-    cd ${srcdir}/binutils-${pkgver}/binutils-build
+    cd ${srcdir}/binutils-${pkgver}/binutils-build-${MINGW_CHOST}
 
     ../configure \
         --build=${MINGW_CHOST} \
@@ -44,7 +44,7 @@ build() {
 }
 
 package() {
-    cd ${srcdir}/binutils-${pkgver}/binutils-build
+    cd ${srcdir}/binutils-${pkgver}/binutils-build-${MINGW_CHOST}
 
     make DESTDIR="${pkgdir}" install