From d94852bab1516f8cb26818ee5ddeac627e323145 Mon Sep 17 00:00:00 2001
From: Ray Redondo <rdrpenguin04@gmail.com>
Date: Sat, 9 Jan 2021 16:09:36 -0600
Subject: [PATCH 1/3] Fix 32-bit winegcc call on Linux when using LLD

---
 cmake/modules/winegcc_wrapper.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/winegcc_wrapper.in b/cmake/modules/winegcc_wrapper.in
index 7677e4c376b..7afd1995b1e 100755
--- a/cmake/modules/winegcc_wrapper.in
+++ b/cmake/modules/winegcc_wrapper.in
@@ -49,8 +49,9 @@ extra_args="-I@WINE_INCLUDE_DIR@ -I@WINE_INCLUDE_DIR@/wine/windows"
 extra_args="$extra_args @WINE_CXX_FLAGS@"
 
 # Apply -m32 library fix if necessary
+# Additionally, apply "-z notext" to fix an inconsistency in ld.lld vs ld.bfd and ld.gold
 if [ "$win32" = true ] && [ "$no_link" != true ]; then
-	extra_args="$extra_args @WINE_32_FLAGS@"
+	extra_args="$extra_args @WINE_32_FLAGS@ -z notext"
 fi
 
 # Apply -m64 library fix if necessary

From 3e6932029edd8d01e0f8543ca00eed04ab0c32c1 Mon Sep 17 00:00:00 2001
From: Ray Redondo <rdrpenguin04@gmail.com>
Date: Sat, 9 Jan 2021 16:17:55 -0600
Subject: [PATCH 2/3] I contributed!

---
 doc/CONTRIBUTORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
index eb030ad7106..2dfe0326800 100644
--- a/doc/CONTRIBUTORS
+++ b/doc/CONTRIBUTORS
@@ -160,6 +160,7 @@ Ododo <olivierdautricourt@gmail.com>
 Paul Nasca <zynaddsubfx_AT_yahoo com>
 Peter Nelson <peter1138@users.sourceforge.net>
 Ra <symbiants@gmail.com>
+Ray Redondo <rdrpenguin04@gmail.com>
 Ron U <sharpblade4@gmail.com>
 Ryan Schmidt <github@ryandesign.com>
 Shane Ambler <GitHub@ShaneWare.Biz>

From caf3ec5cce77bfd66dacc3b7670b655c7d0b94c7 Mon Sep 17 00:00:00 2001
From: Ray Redondo <rdrpenguin04@gmail.com>
Date: Sat, 9 Jan 2021 21:53:48 -0600
Subject: [PATCH 3/3] Let the autogenerated file get autogenerated

This reverts commit 3e6932029edd8d01e0f8543ca00eed04ab0c32c1.
---
 doc/CONTRIBUTORS | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
index 2dfe0326800..eb030ad7106 100644
--- a/doc/CONTRIBUTORS
+++ b/doc/CONTRIBUTORS
@@ -160,7 +160,6 @@ Ododo <olivierdautricourt@gmail.com>
 Paul Nasca <zynaddsubfx_AT_yahoo com>
 Peter Nelson <peter1138@users.sourceforge.net>
 Ra <symbiants@gmail.com>
-Ray Redondo <rdrpenguin04@gmail.com>
 Ron U <sharpblade4@gmail.com>
 Ryan Schmidt <github@ryandesign.com>
 Shane Ambler <GitHub@ShaneWare.Biz>