Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

[sfrench/cifs-2.6.git] / Makefile

diff --git a/Makefile b/Makefile
index ac8c441866b70d0b447b37ef3746374a4040849e..92b74bcd3c2a28870c4368bfa26c60e9e510f3e5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -789,6 +789,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, pointer-sign)
 # disable invalid "can't wrap" optimizations for signed / pointers
 KBUILD_CFLAGS  += $(call cc-option,-fno-strict-overflow)
 
+# Make sure -fstack-check isn't enabled (like gentoo apparently did)
+KBUILD_CFLAGS  += $(call cc-option,-fno-stack-check,)
+
 # conserve stack if available
 KBUILD_CFLAGS   += $(call cc-option,-fconserve-stack)