1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 1b68659c41b4..5e7db44d709e 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -72,7 +72,7 @@ endif
 ifdef CONFIG_CC_STACKPROTECTOR
        cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
-        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)
+        ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(biarch)),y)
                stackp-y := -fstack-protector
                stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
                KBUILD_CFLAGS += $(stackp-y)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1b68659c41b4..5e7db44d709e 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile
@@ -72,7 +72,7 @@ endif
72		72
73	ifdef CONFIG_CC_STACKPROTECTOR	73	ifdef CONFIG_CC_STACKPROTECTOR
74	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh	74	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
75	ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)	75	ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(biarch)),y)
76	stackp-y := -fstack-protector	76	stackp-y := -fstack-protector
77	stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all	77	stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
78	KBUILD_CFLAGS += $(stackp-y)	78	KBUILD_CFLAGS += $(stackp-y)