diff --git a/Makefile b/Makefile
index 132019ef856..6b90953139b 100644
--- a/Makefile
+++ b/Makefile
@@ -628,6 +628,12 @@ else
 KBUILD_CFLAGS  += -Os
 endif
 
+ifeq ($(CONFIG_STACK_CANARIES),y)
+KBUILD_CFLAGS += $(call cc-option,-fstack-protector-all,)
+else
+KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector,)
+endif
+
 KBUILD_CFLAGS += $(subst $(DQUOTE),,$(CONFIG_COMPILER_OPT))
 
 export LDFLAG_LINKERCMD OUTPUT_FORMAT OUTPUT_ARCH
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 490dd5e6075..77e95c2ce99 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -3,11 +3,5 @@ arch-$(CONFIG_LTO) = $(call cc-option,-flto,)
 arch-$(CONFIG_CPU_ARCEM4) = $(call cc-option,-mARCv2EM) \
                          $(call cc-option,-mav2em,) $(call cc-option,-mno-sdata)
 
-ifeq ($(CONFIG_STACK_CANARIES),y)
-cflags-y  += $(call cc-option,-fstack-protector-all,)
-else
-cflags-y += $(call cc-option,-fno-stack-protector,)
-endif
-
 KBUILD_CFLAGS += $(arch-y) $(cflags-y)
 KBUILD_AFLAGS += $(arch-y)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index bb20a9a2bc3..9484210ca0e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -1,5 +1,3 @@
-
-
 KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,)
 
 arch-$(CONFIG_CPU_CORTEX_M3) += $(call cc-option,-mthumb -mcpu=cortex-m3) \
@@ -9,16 +7,9 @@ arch-$(CONFIG_CPU_CORTEX_M4) += $(call cc-option,-mthumb -mcpu=cortex-m4) \
 
 cflags-$(CONFIG_LTO) = $(call cc-option,-flto,)
 
-ifeq ($(CONFIG_STACK_CANARIES),y)
-cflags-y  += $(call cc-option,-fstack-protector-all,)
-else
-cflags-y += $(call cc-option,-fno-stack-protector,)
-endif
-
 KBUILD_CFLAGS += $(cflags-y) $(arch-y)
 KBUILD_AFLAGS += $(arch-y)
 
-
 QEMU_CPU_TYPE_arm = cortex-m3
 QEMU_FLAGS_arm = -cpu  $(QEMU_CPU_TYPE_arm) \
 		-machine lm3s6965evb -nographic
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 33066aa5e3a..cb6920e37c1 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -1,5 +1,3 @@
-
-
 PERF_OPT=$(if $(filter -Os,$(KBUILD_CFLAGS)),,y)
 
 cflags-y += $(call cc-option,-ffunction-sections,) $(call cc-option,-fdata-sections,)
@@ -18,7 +16,6 @@ cflags-$(PREFERRED_STACK_BOUNDARY) += $(call cc-option,-mpreferred-stack-boundar
 endif
 cflags-$(CONFIG_LTO) += $(call cc-option,-flto,)
 
-
 ifneq ($(CONFIG_SSE_FP_MATH),y)
 cflags-y += -mno-sse
 endif
@@ -27,17 +24,9 @@ arch-$(CONFIG_CPU_ATOM) += $(call cc-option,-march=atom) \
 	$(call cc-option,-mtune=atom,$(call cc-option,-mtune=generic))
 arch-$(CONFIG_CPU_MINUTEIA) += $(call cc-option,-march=pentium)
 
-ifeq ($(CONFIG_STACK_CANARIES),y)
-cflags-y  += $(call cc-option,-fstack-protector-all,)
-else
-cflags-y += $(call cc-option,-fno-stack-protector,)
-endif
-
-
 KBUILD_CFLAGS += $(cflags-y) $(arch-y)
 KBUILD_AFLAGS += $(arch-y)
 
-
 QEMU_BIOS ?= /usr/share/qemu
 QEMU_CPU_TYPE_x86 = qemu32
 QEMU_X86_NO_REBOOT_y =