commit ccf9ff524ccb195d648ecb0b168340560b42532c
tree acdfdb390618e9feeac286da141a23e3a87885de
parent 6b3d1a95ba714bfb1cc81362f7f3e01b7654b4f3
author Ingo Molnar <[EMAIL PROTECTED]> 1163674156 +0100
committer Linus Torvalds <[EMAIL PROTECTED]> 1163714425 -0800

[PATCH] x86_64: fix CONFIG_CC_STACKPROTECTOR build bug

on x86_64, the CONFIG_CC_STACKPROTECTOR build fails if used in a
distcc setup that has "CC" defined to "distcc gcc":

 gcc: gcc: linker input file unused because linking not done
 gcc: gcc: linker input file unused because linking not done
 gcc: gcc: linker input file unused because linking not done

this is because the gcc-x86_64-has-stack-protector.sh script
has a 2-parameters assumption. Fix this by passing $(CC) as
a single parameter.

Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
Please-Use-Me-More: make randconfig
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 arch/x86_64/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 1397214..6e38d4d 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -66,8 +66,8 @@ AFLAGS += $(call as-instr,.cfi_startproc
 cflags-y += $(call 
as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
 AFLAGS += $(call 
as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=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-$(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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to