From 5b0b84893411708bf251972af33b522309b40d18 Mon Sep 17 00:00:00 2001 From: "basile@opensource.dyc.edu" Date: Mon, 13 Sep 2010 06:13:19 -0400 Subject: [PATCH] --- yaml --- r: 210758 b: refs/heads/master c: 08c2b394b98786ebb067e2a54d08f1f6f0d247da h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6a76674faa9d..ebb7bcfb39f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fd818642a3c3a257f3b1262145a52bc1bfebd26 +refs/heads/master: 08c2b394b98786ebb067e2a54d08f1f6f0d247da diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile index 8aa1b59b9074..e8c8881351b3 100644 --- a/trunk/arch/x86/Makefile +++ b/trunk/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