Skip to contentSkip to conversation

x86_64: fix CONFIG_CC_STACKPROTECTOR build bug

PATCH New Ingo Molnar 1 participant 1 message Nov 16, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86_64: fix CONFIG_CC_STACKPROTECTOR build bug

Subject: [patch] x86_64: fix CONFIG_CC_STACKPROTECTOR build bug
From: Ingo Molnar <[email protected]>

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.

Please-Use-Me-More: make randconfig

---
 arch/x86_64/Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86_64/Makefile +2 -2
Index: linux/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)