Re: [PATCH 4.9 031/108] jump label: pass kbuild_cflags when checking for asm goto support

Gleb Fotengauer-Malinovskiy
2017-06-19T15:29:45Z

On Thu, Jun 15, 2017 at 07:52:37PM +0200, Greg Kroah-Hartman wrote:
> 4.9-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: David Lin <dtwlin@google.com>
>
>
> [ Upstream commit 35f860f9ba6aac56cc38e8b18916d833a83f1157 ]

This commit introduced a regression which was fixed in
7292ae3d5a18fb922be496e6bb687647193569b4.
Backport the fix too, please.

As long as there is no gcc-plugin support in 4.4, 35f860f9ba6a does not
break anything there, AFAICS.

> Some versions of ARM GCC compiler such as Android toolchain throws in a
> '-fpic' flag by default. This causes the gcc-goto check script to fail
> although some config would have '-fno-pic' flag in the KBUILD_CFLAGS.
>
> This patch passes the KBUILD_CFLAGS to the check script so that the
> script does not rely on the default config from different compilers.
>
> Link: http://lkml.kernel.org/r/20170120234329.78868-1-dtwlin@google.com
> Signed-off-by: David Lin <dtwlin@google.com>
> Acked-by: Steven Rostedt <rostedt@goodmis.org>
> Cc: Michal Marek <mmarek@suse.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- a/Makefile
> +++ b/Makefile
> @@ -797,7 +797,7 @@ KBUILD_CFLAGS += $(call cc-option,-Wer
> KBUILD_ARFLAGS := $(call ar-option,D)
>
> # check for 'asm goto'
> -ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC)), y)
> +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(CC) $(KBUILD_CFLAGS)), y)
> KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
> KBUILD_AFLAGS += -DCC_HAVE_ASM_GOTO
> endif
>

--
glebfm