thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0627: MinGW: build-error when COVERAGE is enabled

Browse Source 
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>
This commit is contained in:
Ken Takata
2024-07-27 13:11:27 +02:00
committed by Christian Brabandt
parent 94082b60d5
commit e4486bad10
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Make_cyg_ming.mak
View File

@@ -1000,12 +1000,15 @@ VIMDLLBASE := vim32$(DEBUG_SUFFIX)
endif endif
TARGET = $(VIMDLLBASE).dll TARGET = $(VIMDLLBASE).dll
LFLAGS += -shared LFLAGS += -shared
EXELFLAGS += -municode -nostdlib EXELFLAGS += -municode
ifneq ($(DEBUG),yes) ifneq ($(DEBUG),yes)
EXELFLAGS += -s EXELFLAGS += -s
endif endif
ifeq ($(COVERAGE),yes) ifeq ($(COVERAGE),yes)
EXELFLAGS += --coverage EXELFLAGS += --coverage
else
EXELFLAGS += -nostdlib
EXECFLAGS = -DUSE_OWNSTARTUP
endif endif
DEFINES += $(DEF_GUI) -DVIMDLL DEFINES += $(DEF_GUI) -DVIMDLL
OBJ += $(GUIOBJ) $(CUIOBJ) OBJ += $(GUIOBJ) $(CUIOBJ)
@@ -1137,12 +1140,14 @@ $(EXEOBJG): | $(OUTDIR)
$(EXEOBJC): | $(OUTDIR) $(EXEOBJC): | $(OUTDIR)
ifeq ($(VIMDLL),yes) ifeq ($(VIMDLL),yes)
ifeq ($(ARCH),x86-64) ifneq ($(COVERAGE),yes)
ifeq ($(ARCH),x86-64)
EXEENTRYC = -Wl,--entry=wmainCRTStartup EXEENTRYC = -Wl,--entry=wmainCRTStartup
EXEENTRYG = -Wl,--entry=wWinMainCRTStartup EXEENTRYG = -Wl,--entry=wWinMainCRTStartup
else ifeq ($(ARCH),i686) else ifeq ($(ARCH),i686)
EXEENTRYC = -Wl,--entry=_wmainCRTStartup EXEENTRYC = -Wl,--entry=_wmainCRTStartup
EXEENTRYG = -Wl,--entry=_wWinMainCRTStartup@0 EXEENTRYG = -Wl,--entry=_wWinMainCRTStartup@0
endif
endif endif
$(TARGET): $(OBJ) $(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) $(OUTDIR)/if_cscope.o: if_cscope.c $(INCL)
$(CC) -c $(CFLAGS) if_cscope.c -o $@ $(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) $(OUTDIR)/if_mzsch.o: if_mzsch.c $(INCL) $(MZSCHEME_INCL) $(MZ_EXTRA_DEP)
$(CC) -c $(CFLAGS) if_mzsch.c -o $@ $(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 $@ $(CC) -c $(CFLAGS) netbeans.c -o $@
$(OUTDIR)/os_w32exec.o: os_w32exe.c $(INCL) $(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) $(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) $(OUTDIR)/os_win32.o: os_win32.c $(INCL) $(MZSCHEME_INCL)
$(CC) -c $(CFLAGS) os_win32.c -o $@ $(CC) -c $(CFLAGS) os_win32.c -o $@

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
627,
/**/ /**/
626, 626,
/**/ /**/