From d91e5dafd5ec57d8e61f1a6ba3628a255785c25c Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 21 Feb 2019 13:34:07 +0100
Subject: [PATCH] patch 8.1.0962: building with MinGW and static libs doesn't
 work

Problem:    Building with MinGW and static libs doesn't work. (Salman Halim)
Solution:   Add -lgcc. (Ken Takata)
---
 src/Make_cyg_ming.mak | 2 +-
 src/version.c         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 03953f4d6..0587b4ded 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -932,7 +932,7 @@ ifeq (yes, $(USE_STDCPLUS))
 LINK = $(CXX)
 ifeq (yes, $(STATIC_STDCPLUS))
 #LIB += -static-libstdc++ -static-libgcc
-LIB += -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+LIB += -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
 endif
 else
 LINK = $(CC)
diff --git a/src/version.c b/src/version.c
index db9ab91f7..59a4e029b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    962,
 /**/
     961,
 /**/
-- 
2.50.1