Commit: patch 9.1.0640: Mingw: Makefile can be improved

[Christian Brabandt]

patch 9.1.0640: Mingw: Makefile can be improved

Commit: https://github.com/vim/vim/commit/3da011871a494ee5f3172278b6209afc6345fb5a
Author: Ken Takata <ken...@csc.jp>
Date: Mon Jul 29 20:43:21 2024 +0200

patch 9.1.0640: Mingw: Makefile can be improved

Problem: Mingw: Makefile can be improved
Solution: Reduce nesting level, directly check if the '-Wl,--entry'
option is required (Ken Takata)

closes: #15386

Signed-off-by: Ken Takata <ken...@csc.jp>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak
index 7c324fb64..d3b04e813 100644
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1140,15 +1140,14 @@ $(EXEOBJG): | $(OUTDIR)
$(EXEOBJC): | $(OUTDIR)

ifeq ($(VIMDLL),yes)
- ifneq ($(COVERAGE),yes)
- ifndef MZSCHEME
- ifeq ($(ARCH),x86-64)
+ ifneq ($(findstring -nostdlib,$(EXELFLAGS)),)
+ # -Wl,--entry needs to be specified when -nostdlib is used.
+ ifeq ($(ARCH),x86-64)
EXEENTRYC = -Wl,--entry=wmainCRTStartup
EXEENTRYG = -Wl,--entry=wWinMainCRTStartup
- else ifeq ($(ARCH),i686)
+ else ifeq ($(ARCH),i686)
EXEENTRYC = -Wl,--entry=_wmainCRTStartup
EXEENTRYG = -Wl,--entry=_wWinMainCRTStartup@0
- endif
endif
endif

diff --git a/src/version.c b/src/version.c
index 97414a08a..53c111893 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 640,
/**/
639,
/**/