Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23386d63 authored by Michal Schmidt's avatar Michal Schmidt Committed by Ingo Molnar
Browse files

x86: Detect stack protector for i386 builds on x86_64 



Stack protector support was not detected when building with
ARCH=i386 on x86_64 systems:

  arch/x86/Makefile:80: stack protector enabled but no compiler support

The "-m32" argument needs to be passed to the detection script.

Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Arjan van de Ven <arjan@infradead.org>
LKML-Reference: <20090829182718.10f566b1@leela>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
--
parent ab94fcf5

arch/x86/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)