* [PATCH] fix cc1 options to disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y
@ 2010-09-13 10:13 basile
2010-09-13 23:00 ` [tip:x86/urgent] x86, build: Disable " tip-bot for basile@opensource.dyc.edu
0 siblings, 1 reply; 2+ messages in thread
From: basile @ 2010-09-13 10:13 UTC (permalink / raw)
To: mingo, tglx, hpa, linux-kernel, akpm
The arch/x86/Makefile uses scripts/gcc-x86_$(BITS)-has-stack-protector.sh
to check if cc1 supports -fstack-protector. When -fPIE is passed to cc1,
these scripts fail causing stack protection to be disabled even when it
is available.
This fix is similar to commit c47efe5548abbf53c2f66e06dcb46183b11d6b22
Reported-by: Kai Dietrich <mail@cleeus.de>
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
Signed-off-by: Anthony G. Basile <basile@opensource.dyc.edu>
---
arch/x86/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 8aa1b59..e8c8881 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) $(biarch)),y)
+ ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
stackp-y := -fstack-protector
KBUILD_CFLAGS += $(stackp-y)
else
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86, build: Disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y
2010-09-13 10:13 [PATCH] fix cc1 options to disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y basile
@ 2010-09-13 23:00 ` tip-bot for basile@opensource.dyc.edu
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for basile@opensource.dyc.edu @ 2010-09-13 23:00 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, mail, zorry, akpm, basile, tglx, hpa
Commit-ID: 08c2b394b98786ebb067e2a54d08f1f6f0d247da
Gitweb: http://git.kernel.org/tip/08c2b394b98786ebb067e2a54d08f1f6f0d247da
Author: basile@opensource.dyc.edu <basile@opensource.dyc.edu>
AuthorDate: Mon, 13 Sep 2010 06:13:19 -0400
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 13 Sep 2010 15:53:16 -0700
x86, build: Disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y
The arch/x86/Makefile uses scripts/gcc-x86_$(BITS)-has-stack-protector.sh
to check if cc1 supports -fstack-protector. When -fPIE is passed to cc1,
these scripts fail causing stack protection to be disabled even when it
is available.
This fix is similar to commit c47efe5548abbf53c2f66e06dcb46183b11d6b22
Reported-by: Kai Dietrich <mail@cleeus.de>
Signed-off-by: Magnus Granberg <zorry@gentoo.org>
LKML-Reference: <20100913101319.748A1148E216@opensource.dyc.edu>
Signed-off-by: Anthony G. Basile <basile@opensource.dyc.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 8aa1b59..e8c8881 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) $(biarch)),y)
+ ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC) $(KBUILD_CPPFLAGS) $(biarch)),y)
stackp-y := -fstack-protector
KBUILD_CFLAGS += $(stackp-y)
else
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-09-13 23:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-13 10:13 [PATCH] fix cc1 options to disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y basile
2010-09-13 23:00 ` [tip:x86/urgent] x86, build: Disable " tip-bot for basile@opensource.dyc.edu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.