diff options
| author | Michal Kubecek <mkubecek@suse.cz> | 2018-05-16 01:51:36 -0400 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-05-17 09:36:40 -0400 |
| commit | 8438ee76b004ef66d125ade64c91fc128047d244 (patch) | |
| tree | 3c174fe99238cf40d957fc4bb4844019226ed0a7 /Makefile | |
| parent | c64ba044ed57ea72cc1c7b14a8dcfb6ded5a759c (diff) | |
Makefile: disable PIE before testing asm goto
Since commit e501ce957a78 ("x86: Force asm-goto"), aarch64 build on
distributions which enable PIE by default (e.g. openSUSE Tumbleweed) does
not detect support for asm goto correctly. The problem is that ARM specific
part of scripts/gcc-goto.sh fails with PIE even with recent gcc versions.
Moving the asm goto detection up in Makefile put it before the place where
we disable PIE. As a result, kernel is built without jump label support.
Move the lines disabling PIE before the asm goto test to make it work.
Fixes: e501ce957a78 ("x86: Force asm-goto")
Reported-by: Andreas Faerber <afaerber@suse.com>
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
| @@ -500,6 +500,9 @@ RETPOLINE_CFLAGS_CLANG := -mretpoline-external-thunk | |||
| 500 | RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG))) | 500 | RETPOLINE_CFLAGS := $(call cc-option,$(RETPOLINE_CFLAGS_GCC),$(call cc-option,$(RETPOLINE_CFLAGS_CLANG))) |
| 501 | export RETPOLINE_CFLAGS | 501 | export RETPOLINE_CFLAGS |
| 502 | 502 | ||
| 503 | KBUILD_CFLAGS += $(call cc-option,-fno-PIE) | ||
| 504 | KBUILD_AFLAGS += $(call cc-option,-fno-PIE) | ||
| 505 | |||
| 503 | # check for 'asm goto' | 506 | # check for 'asm goto' |
| 504 | ifeq ($(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) | 507 | ifeq ($(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y) |
| 505 | CC_HAVE_ASM_GOTO := 1 | 508 | CC_HAVE_ASM_GOTO := 1 |
| @@ -621,8 +624,6 @@ endif # $(dot-config) | |||
| 621 | # Defaults to vmlinux, but the arch makefile usually adds further targets | 624 | # Defaults to vmlinux, but the arch makefile usually adds further targets |
| 622 | all: vmlinux | 625 | all: vmlinux |
| 623 | 626 | ||
| 624 | KBUILD_CFLAGS += $(call cc-option,-fno-PIE) | ||
| 625 | KBUILD_AFLAGS += $(call cc-option,-fno-PIE) | ||
| 626 | CFLAGS_GCOV := -fprofile-arcs -ftest-coverage \ | 627 | CFLAGS_GCOV := -fprofile-arcs -ftest-coverage \ |
| 627 | $(call cc-option,-fno-tree-loop-im) \ | 628 | $(call cc-option,-fno-tree-loop-im) \ |
| 628 | $(call cc-disable-warning,maybe-uninitialized,) | 629 | $(call cc-disable-warning,maybe-uninitialized,) |