Merge branch 'for-3.5-take-2' of git://linux-nfs.org/~bfields/linux

[~andy/linux] / arch / sh / Makefile

diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index e14a676a0c7d51bb3c5656f0d7a3867bc6b5e544..46edf070da1c377574d8ce17e52a74416f9c896d 100644 (file)
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -199,6 +199,10 @@ ifeq ($(CONFIG_DWARF_UNWINDER),y)
   KBUILD_CFLAGS += -fasynchronous-unwind-tables
 endif
 
+ifeq ($(CONFIG_CC_STACKPROTECTOR),y)
+  KBUILD_CFLAGS += -fstack-protector
+endif
+
 libs-$(CONFIG_SUPERH32)                := arch/sh/lib/ $(libs-y)
 libs-$(CONFIG_SUPERH64)                := arch/sh/lib64/ $(libs-y)