From a96be8add358f1f1c52e2f4658635b7774676978 Mon Sep 17 00:00:00 2001
From: Ilia <ilia.kosenkov.at.gm@gmail.com>
Date: Sun, 17 Jan 2021 21:21:30 +0200
Subject: [PATCH 1/3] Creating libgcc_eh for all architectures

---
 mingw-w64-gcc/PKGBUILD | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD
index e58e5843d..6779e6f8e 100644
--- a/mingw-w64-gcc/PKGBUILD
+++ b/mingw-w64-gcc/PKGBUILD
@@ -303,9 +303,7 @@ package_mingw-w64-gcc() {
   sed -i 's|%GCC_NAME%|gcc-'${pkgver}'|g' ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
 
   # Hack for rustc hardcoding -lgcc_eh
-  if [ "${MINGW_CHOST}" = "i686-w64-mingw32" ]; then
-    cp ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver}/libgcc.a ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver}/libgcc_eh.a
-  fi
+  cp ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver}/libgcc.a ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver}/libgcc_eh.a
 }
 
 package_mingw-w64-gcc-fortran() {

From e1fd3bece3abf218efe2b370fd666e99674d40f7 Mon Sep 17 00:00:00 2001
From: Ilia <ilia.kosenkov@outlook.com>
Date: Tue, 19 Jan 2021 21:07:37 +0200
Subject: [PATCH 2/3] A detailed explanation of 'libgcc_eh' hack and why it is
 needed

---
 mingw-w64-gcc/PKGBUILD | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD
index 6779e6f8e..7f6072aef 100644
--- a/mingw-w64-gcc/PKGBUILD
+++ b/mingw-w64-gcc/PKGBUILD
@@ -302,7 +302,9 @@ package_mingw-w64-gcc() {
   install -D -m644 ${srcdir}/gdbinit ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
   sed -i 's|%GCC_NAME%|gcc-'${pkgver}'|g' ${pkgdir}${MINGW_PREFIX}/etc/gdbinit
 
-  # Hack for rustc hardcoding -lgcc_eh
+  # 'gcc' when build with --disable-shared does not produce a standalone 'libgcc_eh.a'.
+  # Instead, everything is put into 'libgcc.a'.
+  # To please compilers that hardcode -lgcc_eh, such as 'rustc', 'libgcc.a' is duplicated as 'libgcc_eh.a'.
   cp ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver}/libgcc.a ${pkgdir}${MINGW_PREFIX}/lib/gcc/${MINGW_CHOST}/${pkgver}/libgcc_eh.a
 }
 

From db7701a6a598450ff814f0f51db95b8386f87da1 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sun, 28 Feb 2021 23:52:36 +0100
Subject: [PATCH 3/3] Bump version

---
 mingw-w64-gcc/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-gcc/PKGBUILD b/mingw-w64-gcc/PKGBUILD
index 7f6072aef..4cbe82f0c 100644
--- a/mingw-w64-gcc/PKGBUILD
+++ b/mingw-w64-gcc/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=8.3.0
 _srcver=8.3.0
 #_srcver=8.3.0-RC-20190215
-pkgrel=9500
+pkgrel=9501
 pkgdesc="GCC for the MinGW-w64"
 arch=('any')
 url="https://gcc.gnu.org"