Merge branch 'js/mingw-gcc-stack-protect'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2019 22:16:47 +0000 (15:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jul 2019 22:16:47 +0000 (15:16 -0700)
Windows update.

* js/mingw-gcc-stack-protect:
mingw: enable stack smashing protector

config.mak.uname
index 3fde48c64da61c6964ea5584aa5c27ec5dcbc389..48a6723222dfb7c4cedb49d4523faa6c3003a803 100644 (file)
@@ -655,7 +655,8 @@ else
                        BASIC_LDFLAGS += -Wl,--large-address-aware
                endif
                CC = gcc
-               COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY
+               COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
+                       -fstack-protector-strong
                EXTLIBS += -lntdll
                INSTALL = /bin/install
                NO_R_TO_GCC_LINKER = YesPlease