Attachment 770256 Details for Bug 1092456

[patch] tentative patch

Makefile-disable-PIE-before-testing-asm-goto.patch (text/plain), 1.58 KB, created by Michal Kubeček on 2018-05-15 10:50:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Kubeček

Created: 2018-05-15 10:50:55 UTC

Size: 1.58 KB

patch

obsolete

>From: Michal Kubecek <mkubecek@suse.cz>
>Date: Tue, 15 May 2018 07:39:08 +0200
>Subject: Makefile: disable PIE before testing asm goto
>Patch-mainline: Not yet, testing
>References: bsc#1092456
>
>Since commit e501ce957a78 ("x86: Force asm-goto"), aarch64 build does not
>detect support asm goto correctly. This is because the testcase in
>scripts/gcc-goto.sh fails with -fPIE and moving the detection earlier put
>it before the place where we disable PIE.
>
>Fix it by moving the lines disabling PIE before the asm goto test.
>
>Fixes: e501ce957a78 ("x86: Force asm-goto")
>Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
>---
> Makefile | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index 65429701ad5a..0e1abd9cc30c 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -505,6 +505,9 @@ RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk
> RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG)))
> export RETPOLINE_CFLAGS
> 
>+KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)
>+KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
>+
> # check for 'asm goto'
> ifeq ($(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
>   CC_HAVE_ASM_GOTO := 1
>@@ -626,8 +629,6 @@ endif # $(dot-config)
> # Defaults to vmlinux, but the arch makefile usually adds further targets
> all: vmlinux
> 
>-KBUILD_CFLAGS	+= $(call cc-option,-fno-PIE)
>-KBUILD_AFLAGS	+= $(call cc-option,-fno-PIE)
> CFLAGS_GCOV	:= -fprofile-arcs -ftest-coverage -fno-tree-loop-im $(call cc-disable-warning,maybe-uninitialized,)
> export CFLAGS_GCOV CFLAGS_KCOV
> 
>-- 
>2.16.3
>

Actions: View | Diff

Attachments on bug 1092456: 770256