Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932118AbWHPRLm (ORCPT ); Wed, 16 Aug 2006 13:11:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932114AbWHPRLG (ORCPT ); Wed, 16 Aug 2006 13:11:06 -0400 Received: from a222036.upc-a.chello.nl ([62.163.222.36]:37086 "EHLO laptopd505.fenrus.org") by vger.kernel.org with ESMTP id S932118AbWHPRKn (ORCPT ); Wed, 16 Aug 2006 13:10:43 -0400 Subject: [patch 5/5] -fstack-protector feature: Enable the compiler flags in CFLAGS From: Arjan van de Ven To: linux-kernel@vger.kernel.org Cc: sam@ravnborg.org, akpm@osdl.org, ak@suse.de In-Reply-To: <1155746902.3023.63.camel@laptopd505.fenrus.org> References: <1155746902.3023.63.camel@laptopd505.fenrus.org> Content-Type: text/plain Content-Transfer-Encoding: 7bit Date: Wed, 16 Aug 2006 18:53:17 +0200 Message-Id: <1155747197.3023.73.camel@laptopd505.fenrus.org> Mime-Version: 1.0 X-Mailer: Evolution 2.2.3 (2.2.3-2.fc4) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2183 Lines: 49 Subject: [patch 5/5] Add the -fstack-protector option to the CFLAGS From: Arjan van de Ven Add a feature check that checks that the gcc compiler has stack-protector support and has the bugfix for PR28281 to make this work in kernel mode. The easiest solution I could find was to have a shell script in scripts/ to do the detection; if needed we can make this fancier in the future without making the makefile too complex. Signed-off-by: Arjan van de Ven CC: Andi Kleen CC: Sam Ravnborg --- arch/x86_64/Makefile | 3 +++ scripts/gcc-x86_64-has-stack-protector.sh | 8 ++++++++ 2 files changed, 11 insertions(+) Index: linux-2.6.18-rc4-stackprot/arch/x86_64/Makefile =================================================================== --- linux-2.6.18-rc4-stackprot.orig/arch/x86_64/Makefile +++ linux-2.6.18-rc4-stackprot/arch/x86_64/Makefile @@ -55,6 +55,9 @@ cflags-y += $(call cc-option,-funit-at-a # prevent gcc from generating any FP code by mistake cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) +cflags-$(CONFIG_CC_STACKPROTECTOR) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector ) +cflags-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector-all ) + CFLAGS += $(cflags-y) CFLAGS_KERNEL += $(cflags-kernel-y) AFLAGS += -m64 Index: linux-2.6.18-rc4-stackprot/scripts/gcc-x86_64-has-stack-protector.sh =================================================================== --- /dev/null +++ linux-2.6.18-rc4-stackprot/scripts/gcc-x86_64-has-stack-protector.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +echo "int foo(void) { char X[200]; return 3; }" | $1 -S -xc -c -O0 -mcmodel=kernel -fstack-protector - -o - | grep -q "%gs" +if [ "$?" -eq "0" ] ; then + echo $2 +fi - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/