Re: [patch 5/5] -fstack-protector feature: Enable the compiler flags in CFLAGS

[Sam Ravnborg]

On Wed, Aug 16, 2006 at 06:53:17PM +0200, Arjan van de Ven wrote:
> Subject: [patch 5/5] Add the -fstack-protector option to the CFLAGS
> From: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
> 
> 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 <arjan@xxxxxxxxxxxxxxx>
> CC: Andi Kleen <ak@xxxxxxx>
> CC: Sam Ravnborg <sam@xxxxxxxxxxxx>
> 
> ---
>  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 )
> +
I agree with the pricinple on hiding the check in the script.
But please try to keep lines within 80 coloumn limit.
something like this which is functionality wise equal:

stack-protector = $(shell $(CONFIG_SHELL) \
                   $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(1))
cflags-$(CONFIG_CC_STACKPROTECTOR) += \
                   $(call stack-protector, $(CC) -fstack-protector)
cflags-$(CONFIG_CC_STACKPROTECTOR_ALL) += \
                   $(call stack-protector, $(CC) -fstack-protector-all)

I do not like the broken lines either but with these long CONFIG_ names
it is needed.

Otherwised Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>

PS - above is untested...

	Sam
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/