From 40bcc2f2ba297b02ddb9b08cdb7f028fa54b72ae Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 13 Aug 2022 13:40:31 +0200
Subject: [PATCH] binutils: backport support for -exclude-symbols

---
 mingw-w64-binutils/PKGBUILD | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-binutils/PKGBUILD b/mingw-w64-binutils/PKGBUILD
index 0857c5a5dd..b84561768f 100644
--- a/mingw-w64-binutils/PKGBUILD
+++ b/mingw-w64-binutils/PKGBUILD
@@ -6,7 +6,7 @@ _realname=binutils
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 pkgver=2.39
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -26,7 +26,10 @@ source=(https://ftp.gnu.org/gnu/binutils/${_realname}-${pkgver}.tar.xz{,.sig}
         2003-Restore-old-behaviour-of-windres-so-that-options-con.patch
         3001-Fix-a-conflict-between-the-linker-s-need-to-rename-s.patch
         reproducible-import-libraries.patch
-        specify-timestamp.patch)
+        specify-timestamp.patch
+        "37513c1efbe5e8e1863f8ddf078cd395aa663388.patch::https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=37513c1efbe5e8e1863f8ddf078cd395aa663388"
+        "61f6b650f9bb7fd276b45427b9202f3263465376.patch::https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=61f6b650f9bb7fd276b45427b9202f3263465376"
+)
 sha256sums=('645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00'
             'SKIP'
             '2c99345fc575c3a060d6677537f636c6c4154fac0fde508070f3b6296c1060d4'
@@ -36,7 +39,9 @@ sha256sums=('645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00'
             'd584f1cd9e94cba0e9b27625c4acc8ad5242cd625c9b44839d42fc116072568c'
             '44ca688607d4e2dc1d7e70fee7803f3a0f4a0e10ad44c616c7c491cb6bfc90b9'
             'a094660ec95996c00b598429843b7869037732146442af567ada9f539bd40480'
-            '27696da8ecfff307537a461b205fad44d6abc1fa648fbf839e72a1d3ea71c40a')
+            '27696da8ecfff307537a461b205fad44d6abc1fa648fbf839e72a1d3ea71c40a'
+            'b2f159fe91da6ca4f6c2d91dba09883d777533bc952898939ac8185aa712ef5c'
+            '3d1ab4038c28afb27bfa89702ec86ce5e1b852523aa0e550e1ad35d1452b7804')
 validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93'
               '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F')
 
@@ -68,6 +73,12 @@ prepare() {
   # https://sourceware.org/bugzilla/show_bug.cgi?id=29389
   apply_patch_with_msg "3001-Fix-a-conflict-between-the-linker-s-need-to-rename-s.patch"
 
+  # Backport from master:
+  # https://sourceware.org/pipermail/binutils/2022-July/121902.html
+  apply_patch_with_msg \
+    37513c1efbe5e8e1863f8ddf078cd395aa663388.patch \
+    61f6b650f9bb7fd276b45427b9202f3263465376.patch
+
   # patches for reproducibility from Debian:
   # https://salsa.debian.org/mingw-w64-team/binutils-mingw-w64/-/tree/master/debian/patches
   patch -p2 -i "${srcdir}/reproducible-import-libraries.patch"