diff options
| author | Ken Takata <kentkt@csc.jp> | 2024-07-27 13:11:27 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-27 13:16:38 +0200 |
| commit | e4486bad10dc605e2c996c9ef2f7656c01c7eb33 (patch) | |
| tree | 26ed0ef32ba9caaf80c05c074df61e0a5d1e26b0 | |
| parent | 94082b60d5087246b19615d9b7d46e377c4eb766 (diff) | |
patch 9.1.0627: MinGW: build-error when COVERAGE is enabledv9.1.0627
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>
| -rw-r--r-- | src/Make_cyg_ming.mak | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index bd9d0ac945..5fb3a41f08 100644 --- 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 @@ $(EXEOBJG): | $(OUTDIR) $(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 @@ $(OUTDIR)/gui_w32.o: gui_w32.c $(INCL) $(GUI_INCL) version.h $(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 @@ $(OUTDIR)/netbeans.o: netbeans.c $(INCL) $(NBDEBUG_INCL) $(NBDEBUG_SRC) $(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 $@ diff --git a/src/version.c b/src/version.c index 54fda947b7..d6f8085628 100644 --- 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 */ /**/ + 627, +/**/ 626, /**/ 625, |