Messages in this thread Patch in this message | | | Date | Sun, 30 Aug 2009 18:43:07 GMT | From | tip-bot for Michal Schmidt <> | Subject | [tip:x86/asm] x86: Detect stack protector for i386 builds on x86_64 |
| |
Commit-ID: 23386d63bbb3199cf247313ec088878d72debcfd Gitweb: http://git.kernel.org/tip/23386d63bbb3199cf247313ec088878d72debcfd Author: Michal Schmidt <mschmidt@redhat.com> AuthorDate: Sat, 29 Aug 2009 18:27:18 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Sun, 30 Aug 2009 20:39:48 +0200
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: Michal 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: Ingo Molnar <mingo@elte.hu> --
--- arch/x86/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1b68659..5e7db44 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)
| |