Skip to content

Commit 97db40d

Browse files
dschoGit for Windows Build Agent
authored andcommitted
mingw: avoid over-specifying --pic-executable
In bf2d5d8 (Don't let ld strip relocations, 2016-01-16) (picked from 6a237925bf10), Git for Windows introduced the `-Wl,-pic-executable` flag, specifying the exact entry point via `-e`. This required discerning between i686 and x86_64 code because the former required the symbol to be prefixed with an underscore, the latter did not. As per https://sourceware.org/bugzilla/show_bug.cgi?id=10865, the specified symbols are already the default, though. So let's drop the overly-specific definition. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent fa008ae commit 97db40d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

config.mak.uname

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -750,15 +750,15 @@ ifeq ($(uname_S),MINGW)
750750
ifeq (MINGW32,$(MSYSTEM))
751751
prefix = /mingw32
752752
HOST_CPU = i686
753-
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup -Wl,--large-address-aware
753+
BASIC_LDFLAGS += -Wl,--pic-executable -Wl,--large-address-aware
754754
else ifeq (MINGW64,$(MSYSTEM))
755755
prefix = /mingw64
756756
HOST_CPU = x86_64
757-
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
757+
BASIC_LDFLAGS += -Wl,--pic-executable
758758
else ifeq (CLANGARM64,$(MSYSTEM))
759759
prefix = /clangarm64
760760
HOST_CPU = aarch64
761-
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
761+
BASIC_LDFLAGS += -Wl,--pic-executable
762762
else
763763
endif
764764
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \

0 commit comments

Comments
 (0)