1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 8a4c24c96d0..5128b178529 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -74,7 +74,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 8a4c24c96d0..5128b178529 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile
@@ -74,7 +74,7 @@ endif
74		74
75	ifdef CONFIG_CC_STACKPROTECTOR	75	ifdef CONFIG_CC_STACKPROTECTOR
76	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh	76	cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
77	ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y)	77	ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(biarch)),y)
78	stackp-y := -fstack-protector	78	stackp-y := -fstack-protector
79	stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all	79	stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all
80	KBUILD_CFLAGS += $(stackp-y)	80	KBUILD_CFLAGS += $(stackp-y)