Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[zynq/linux.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 10056ccdb8be2c5592e6d37f8fcc512378912dac..9db3c584b2cb46fb45d10a61b72be150a830435d 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -304,6 +304,18 @@ else
 KBUILD_IMAGE := $(boot)/zImage
 endif
 
+ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK),y)
+prepare: stack_protector_prepare
+stack_protector_prepare: prepare0
+       $(eval KBUILD_CFLAGS += \
+               -fplugin-arg-arm_ssp_per_task_plugin-tso=$(shell        \
+                       awk '{if ($$2 == "THREAD_SZ_ORDER") print $$3;}'\
+                               include/generated/asm-offsets.h)        \
+               -fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell     \
+                       awk '{if ($$2 == "TI_STACK_CANARY") print $$3;}'\
+                               include/generated/asm-offsets.h))
+endif
+
 all:   $(notdir $(KBUILD_IMAGE))