Skip to content

Commit 1b54f49

Browse files
ismailGit for Windows Build Agent
authored andcommitted
Don't let ld strip relocations
This is the first step for enabling ASLR (Address Space Layout Randomization) support. We want to enable ASLR for better protection against exploiting security holes in Git. The problem fixed by this commit is that `ld.exe` seems to be stripping relocations which in turn will break ASLR support. We just make sure it's not stripping the main executable entry. Signed-off-by: İsmail Dönmez <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 49810d1 commit 1b54f49

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

config.mak.uname

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,12 @@ else
575575
ifeq (MINGW32,$(MSYSTEM))
576576
prefix = /mingw32
577577
HOST_CPU = i686
578+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,_mainCRTStartup
578579
endif
579580
ifeq (MINGW64,$(MSYSTEM))
580581
prefix = /mingw64
581582
HOST_CPU = x86_64
583+
BASIC_LDFLAGS += -Wl,--pic-executable,-e,mainCRTStartup
582584
else
583585
COMPAT_CFLAGS += -D_USE_32BIT_TIME_T
584586
BASIC_LDFLAGS += -Wl,--large-address-aware

0 commit comments

Comments
 (0)