From fcbb849c26e999db4922237492597f56edbcd39a Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 28 Mar 2023 10:39:01 +0200
Subject: [PATCH] speedo: Fix regression due to switching from gcc 8.3 to 10.2

* build-aux/speedo.mk (speedo_pkg_zlib_make_args): Use -static-libgcc.

(cherry picked from commit 04f1d9649cfb9163907fe97d20821ddd1be44f82)
---
 build-aux/speedo.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 56e317275..f21f43731 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -699,9 +699,13 @@ speedo_pkg_w64_gpgex_configure = \
 # External packages
 #
 
+# gcc 10.2 takes __udivdi3 from the exception handler DLL and thus
+# requires it.  This is a regression from gcc 8.3 and earlier.  To fix
+# this we need to pass -static-libgcc.
 ifeq ($(TARGETOS),w32)
 speedo_pkg_zlib_make_args = \
-        -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a
+        -fwin32/Makefile.gcc PREFIX=$(host)- IMPLIB=libz.dll.a \
+         LDFLAGS=-static-libgcc
 
 speedo_pkg_zlib_make_args_inst = \
         -fwin32/Makefile.gcc \