From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2019 22:16:47 +0000 (-0700)
Subject: Merge branch 'js/mingw-gcc-stack-protect'
X-Git-Tag: v2.23.0-rc0~51
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/32749c35a4ca4f5b2a876f799ede7343b12cc658?hp=9b9b24bd57170da17ddcafd7c4601ad2fb8910b2

Merge branch 'js/mingw-gcc-stack-protect'

Windows update.

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

diff --git a/config.mak.uname b/config.mak.uname
index 3fde48c64d..48a6723222 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -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