Mercurial > vim
changeset 35815:81d182d95063 v9.1.0627
patch 9.1.0627: MinGW: build-error when COVERAGE is enabled
Commit: https://github.com/vim/vim/commit/e4486bad10dc605e2c996c9ef2f7656c01c7eb33
Author: Ken Takata <kentkt@csc.jp>
Date: Sat Jul 27 13:11:27 2024 +0200
patch 9.1.0627: MinGW: build-error when COVERAGE is enabled
Problem: MinGW: build-error when COVERAGE is enabled
(after v9.1.0621)
Solution: Fix regressions in v9.1.0621 and v9.1.0622
(Ken Takata)
* Fix build error when COVERAGE=yes.
* Fix if_lua with USE_GC_SECTIONS=yes.
related: #15361
Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 27 Jul 2024 13:30:08 +0200 |
| parents | 127b6ff6a1fa |
| children | 2e9ec9df16b7 |
| files | src/Make_cyg_ming.mak src/version.c |
| diffstat | 2 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -1000,12 +1000,15 @@ VIMDLLBASE := vim32$(DEBUG_SUFFIX) endif TARGET = $(VIMDLLBASE).dll LFLAGS += -shared -EXELFLAGS += -municode -nostdlib +EXELFLAGS += -municode ifneq ($(DEBUG),yes) EXELFLAGS += -s endif ifeq ($(COVERAGE),yes) EXELFLAGS += --coverage + else +EXELFLAGS += -nostdlib +EXECFLAGS = -DUSE_OWNSTARTUP endif DEFINES += $(DEF_GUI) -DVIMDLL OBJ += $(GUIOBJ) $(CUIOBJ) @@ -1137,12 +1140,14 @@ uninstall.exe: uninstall.c dosinst.h ver $(EXEOBJC): | $(OUTDIR) ifeq ($(VIMDLL),yes) - ifeq ($(ARCH),x86-64) + ifneq ($(COVERAGE),yes) + 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 $(TARGET): $(OBJ) @@ -1320,6 +1325,9 @@ endif $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) $(CC) -c $(CFLAGS) if_cscope.c -o $@ +$(OUTDIR)/if_lua.o: if_lua.c $(INCL) + $(CC) -c $(CFLAGS:-fno-asynchronous-unwind-tables=) if_lua.c -o $@ + $(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) $(MZSCHEME_INCL) $(MZ_EXTRA_DEP) $(CC) -c $(CFLAGS) if_mzsch.c -o $@ @@ -1353,10 +1361,10 @@ endif $(CC) -c $(CFLAGS) netbeans.c -o $@ $(OUTDIR)/os_w32exec.o: os_w32exe.c $(INCL) - $(CC) -c $(CFLAGS) -UFEAT_GUI_MSWIN -DUSE_OWNSTARTUP os_w32exe.c -o $@ + $(CC) -c $(CFLAGS) -UFEAT_GUI_MSWIN $(EXECFLAGS) os_w32exe.c -o $@ $(OUTDIR)/os_w32exeg.o: os_w32exe.c $(INCL) - $(CC) -c $(CFLAGS) -DUSE_OWNSTARTUP os_w32exe.c -o $@ + $(CC) -c $(CFLAGS) $(EXECFLAGS) os_w32exe.c -o $@ $(OUTDIR)/os_win32.o: os_win32.c $(INCL) $(MZSCHEME_INCL) $(CC) -c $(CFLAGS) os_win32.c -o $@