mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 17:25:38 +00:00
a76d4933c3
commit d5c8d6e0fa upstream.
as-instr uses KBUILD_AFLAGS, but as-option uses KBUILD_CFLAGS. This can
cause as-option to fail unexpectedly when CONFIG_WERROR is set, because
clang will emit -Werror,-Wunused-command-line-argument for various -m
and -f flags in KBUILD_CFLAGS for assembler sources.
Callers of as-option and as-instr should be adding flags to
KBUILD_AFLAGS / aflags-y, not KBUILD_CFLAGS / cflags-y. Use
KBUILD_AFLAGS in all macros to clear up the initial problem.
Unfortunately, -Wunused-command-line-argument can still be triggered
with clang by the presence of warning flags or macro definitions because
'-x assembler' is used, instead of '-x assembler-with-cpp', which will
consume these flags. Switch to '-x assembler-with-cpp' in places where
'-x assembler' is used, as the compiler is always used as the driver for
out of line assembler sources in the kernel.
Finally, add -Werror to these macros so that they behave consistently
whether or not CONFIG_WERROR is set.
[nathan: Reworded and expanded on problems in commit message
Use '-x assembler-with-cpp' in a couple more places]
Link: https://github.com/ClangBuiltLinux/linux/issues/1699
Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
66 lines
2.6 KiB
Plaintext
66 lines
2.6 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
# Kconfig helper macros
|
|
|
|
# Convenient variables
|
|
comma := ,
|
|
quote := "
|
|
squote := '
|
|
empty :=
|
|
space := $(empty) $(empty)
|
|
dollar := $
|
|
right_paren := )
|
|
left_paren := (
|
|
|
|
# $(if-success,<command>,<then>,<else>)
|
|
# Return <then> if <command> exits with 0, <else> otherwise.
|
|
if-success = $(shell,{ $(1); } >/dev/null 2>&1 && echo "$(2)" || echo "$(3)")
|
|
|
|
# $(success,<command>)
|
|
# Return y if <command> exits with 0, n otherwise
|
|
success = $(if-success,$(1),y,n)
|
|
|
|
# $(failure,<command>)
|
|
# Return n if <command> exits with 0, y otherwise
|
|
failure = $(if-success,$(1),n,y)
|
|
|
|
# $(cc-option,<flag>)
|
|
# Return y if the compiler supports <flag>, n otherwise
|
|
cc-option = $(success,trap "rm -rf .tmp_$$" EXIT; mkdir .tmp_$$; $(CC) -Werror $(CLANG_FLAGS) $(1) -c -x c /dev/null -o .tmp_$$/tmp.o)
|
|
|
|
# $(ld-option,<flag>)
|
|
# Return y if the linker supports <flag>, n otherwise
|
|
ld-option = $(success,$(LD) -v $(1))
|
|
|
|
# $(as-instr,<instr>)
|
|
# Return y if the assembler supports <instr>, n otherwise
|
|
as-instr = $(success,printf "%b\n" "$(1)" | $(CC) $(CLANG_FLAGS) -c -x assembler-with-cpp -o /dev/null -)
|
|
|
|
# check if $(CC) and $(LD) exist
|
|
$(error-if,$(failure,command -v $(CC)),C compiler '$(CC)' not found)
|
|
$(error-if,$(failure,command -v $(LD)),linker '$(LD)' not found)
|
|
|
|
# Get the C compiler name, version, and error out if it is not supported.
|
|
cc-info := $(shell,$(srctree)/scripts/cc-version.sh $(CC))
|
|
$(error-if,$(success,test -z "$(cc-info)"),Sorry$(comma) this C compiler is not supported.)
|
|
cc-name := $(shell,set -- $(cc-info) && echo $1)
|
|
cc-version := $(shell,set -- $(cc-info) && echo $2)
|
|
|
|
# Get the assembler name, version, and error out if it is not supported.
|
|
as-info := $(shell,$(srctree)/scripts/as-version.sh $(CC) $(CLANG_FLAGS))
|
|
$(error-if,$(success,test -z "$(as-info)"),Sorry$(comma) this assembler is not supported.)
|
|
as-name := $(shell,set -- $(as-info) && echo $1)
|
|
as-version := $(shell,set -- $(as-info) && echo $2)
|
|
|
|
# Get the linker name, version, and error out if it is not supported.
|
|
ld-info := $(shell,$(srctree)/scripts/ld-version.sh $(LD))
|
|
$(error-if,$(success,test -z "$(ld-info)"),Sorry$(comma) this linker is not supported.)
|
|
ld-name := $(shell,set -- $(ld-info) && echo $1)
|
|
ld-version := $(shell,set -- $(ld-info) && echo $2)
|
|
|
|
# machine bit flags
|
|
# $(m32-flag): -m32 if the compiler supports it, or an empty string otherwise.
|
|
# $(m64-flag): -m64 if the compiler supports it, or an empty string otherwise.
|
|
cc-option-bit = $(if-success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null,$(1))
|
|
m32-flag := $(cc-option-bit,-m32)
|
|
m64-flag := $(cc-option-bit,-m64)
|