From 81e1d03428e30522b6aea5557428eadab7c18f6b Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Tue, 26 Sep 2006 10:52:39 +0200 Subject: [PATCH] --- yaml --- r: 35937 b: refs/heads/master c: 4f7fd4d7a79193ceda4ce77f75e22917d33fa154 h: refs/heads/master i: 35935: 40fe9b7d3a251c928598afc4f9d1eaf8f7577c3a v: v3 --- [refs] | 2 +- trunk/arch/x86_64/Makefile | 3 +++ trunk/scripts/gcc-x86_64-has-stack-protector.sh | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 trunk/scripts/gcc-x86_64-has-stack-protector.sh diff --git a/[refs] b/[refs] index e7ca37e3e15d..74650f2afae2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3162f751d04086a9d006342de63ac8f44fe0f72a +refs/heads/master: 4f7fd4d7a79193ceda4ce77f75e22917d33fa154 diff --git a/trunk/arch/x86_64/Makefile b/trunk/arch/x86_64/Makefile index d6472ddf5f6e..2b8d07c70106 100644 --- a/trunk/arch/x86_64/Makefile +++ b/trunk/arch/x86_64/Makefile @@ -58,6 +58,9 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,) +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 diff --git a/trunk/scripts/gcc-x86_64-has-stack-protector.sh b/trunk/scripts/gcc-x86_64-has-stack-protector.sh new file mode 100644 index 000000000000..325c0a1b03b6 --- /dev/null +++ b/trunk/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 - 2> /dev/null | grep -q "%gs" +if [ "$?" -eq "0" ] ; then + echo $2 +fi