Mercurial > vim

changeset 35843:577b9ff7da39 v9.1.0640

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0640: Mingw: Makefile can be improved Commit: https://github.com/vim/vim/commit/3da011871a494ee5f3172278b6209afc6345fb5a Author: Ken Takata <kentkt@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 <kentkt@csc.jp> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Mon, 29 Jul 2024 21:00:03 +0200
parents ddd332ad53bb
children 94724538fb07
files src/Make_cyg_ming.mak src/version.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -1140,15 +1140,14 @@ uninstall.exe: uninstall.c dosinst.h ver
 $(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
 
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    640,
+/**/
     639,
 /**/
     638,