Attachment #454150 for bug #584014

Lines 621-626 include arch/$(SRCARCH)/Makefile Link Here

(-)a/Makefile (-2 / +4 lines)
621		621
622	KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)	622	KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
623	KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)	623	KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
		624	KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
		625	KBUILD_AFLAGS += $(call cc-option,-fno-PIE)
624		626
625	ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE	627	ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
626	KBUILD_CFLAGS += -Os	628	KBUILD_CFLAGS += -Os
627	--
628	arch/x86/purgatory/Makefile \| 1 +	629	arch/x86/purgatory/Makefile \| 1 +
629	1 file changed, 1 insertion(+)	630	1 file changed, 1 insertion(+)
630	-- a/arch/x86/purgatory/Makefile	631	++ b/arch/x86/purgatory/Makefile
Lines 16-21 KCOV_INSTRUMENT := n Link Here
16		16
17	KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large	17	KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -c -MD -Os -mcmodel=large
18	KBUILD_CFLAGS += -m$(BITS)	18	KBUILD_CFLAGS += -m$(BITS)
		19	KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
19		20
20	$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE	21	$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
21	$(call if_changed,ld)	22	$(call if_changed,ld)





KBUILD_AFLAGS_KERNEL :=
KBUILD_CFLAGS_KERNEL :=
KBUILD_AFLAGS   := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)
KBUILD_AFLAGS_MODULE  := -DMODULE
KBUILD_CFLAGS_MODULE  := -DMODULE
KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds


KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)
KBUILD_CFLAGS	+= $(call cc-disable-warning,maybe-uninitialized,)
KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)
KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)

ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
KBUILD_CFLAGS	+= -Os
--
scripts/gcc-x86_64-has-stack-protector.sh |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
++ b/scripts/gcc-x86_64-has-stack-protector.sh

#!/bin/sh

echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
if [ "$?" -eq "0" ] ; then
   echo y
else

Return to bug 584014

Lines 403-409 KBUILD_CFLAGS := -Wall -Wundef -Wstric Link Here

(-)a/Makefile (-6 / +3 lines)
403		403
404	KBUILD_AFLAGS_KERNEL :=	404	KBUILD_AFLAGS_KERNEL :=
405	KBUILD_CFLAGS_KERNEL :=	405	KBUILD_CFLAGS_KERNEL :=
406	KBUILD_AFLAGS := -D__ASSEMBLY__	406	KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)
407	KBUILD_AFLAGS_MODULE := -DMODULE	407	KBUILD_AFLAGS_MODULE := -DMODULE
408	KBUILD_CFLAGS_MODULE := -DMODULE	408	KBUILD_CFLAGS_MODULE := -DMODULE
409	KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds	409	KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
Lines 621-628 include arch/$(SRCARCH)/Makefile Link Here
621		621
622	KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)	622	KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
623	KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)	623	KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
624	KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
625	KBUILD_AFLAGS += $(call cc-option,-fno-PIE)
626		624
627	ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE	625	ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
628	KBUILD_CFLAGS += -Os	626	KBUILD_CFLAGS += -Os
629	--
630	scripts/gcc-x86_64-has-stack-protector.sh \| 2 +-	627	scripts/gcc-x86_64-has-stack-protector.sh \| 2 +-
631	1 file changed, 1 insertion(+), 1 deletion(-)	628	1 file changed, 1 insertion(+), 1 deletion(-)
632	-- a/scripts/gcc-x86_64-has-stack-protector.sh	629	++ b/scripts/gcc-x86_64-has-stack-protector.sh
Lines 1-6 Link Here
1	#!/bin/sh	1	#!/bin/sh
2		2
3	echo "int foo(void) { char X[200]; return 3; }" \| $* -S -x c -c -O0 -mcmodel=kernel -fstack-protector - -o - 2> /dev/null \| grep -q "%gs"	3	echo "int foo(void) { char X[200]; return 3; }" \| $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null \| grep -q "%gs"
4	if [ "$?" -eq "0" ] ; then	4	if [ "$?" -eq "0" ] ; then
5	echo y	5	echo y
6	else	6	else