diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2009-08-29 12:27:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-30 14:39:48 -0400 |
| commit | 23386d63bbb3199cf247313ec088878d72debcfd (patch) | |
| tree | 525a042d38dd96a763aea81e587beeae7c63868b /arch/x86/Makefile | |
| parent | ab94fcf528d127fcb490175512a8910f37e5b346 (diff) | |
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>
--
Diffstat (limited to 'arch/x86/Makefile')
| -rw-r--r-- | arch/x86/Makefile | 2 |
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 | |||
| 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) |