[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-08c2b394b98786ebb067e2a54d08f1f6f0d247da@git.kernel.org>
Date: Mon, 13 Sep 2010 23:00:56 GMT
From: "tip-bot for basile@...nsource.dyc.edu" <basile@...nsource.dyc.edu>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
mail@...eus.de, zorry@...too.org, akpm@...ux-foundation.org,
basile@...nsource.dyc.edu, tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/urgent] x86, build: Disable -fPIE when compiling with CONFIG_CC_STACKPROTECTOR=y
Commit-ID: 08c2b394b98786ebb067e2a54d08f1f6f0d247da
Gitweb: http://git.kernel.org/tip/08c2b394b98786ebb067e2a54d08f1f6f0d247da
Author: basile@...nsource.dyc.edu <basile@...nsource.dyc.edu>
AuthorDate: Mon, 13 Sep 2010 06:13:19 -0400
Committer: H. Peter Anvin <hpa@...ux.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@...eus.de>
Signed-off-by: Magnus Granberg <zorry@...too.org>
LKML-Reference: <20100913101319.748A1148E216@...nsource.dyc.edu>
Signed-off-by: Anthony G. Basile <basile@...nsource.dyc.edu>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: H. Peter Anvin <hpa@...ux.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists