Commit 8438ee76 authored May 16, 2018 by Michal Kubecek Committed by Masahiro Yamada May 17, 2018

Makefile: disable PIE before testing asm goto

Since commit e501ce95 ("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: e501ce95 ("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>

parent c64ba044

Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -500,6 +500,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
		@@ -621,8 +624,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 \
		$(call cc-option,-fno-tree-loop-im) \
		$(call cc-disable-warning,maybe-uninitialized,)