summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2021-08-28 18:51:01 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2021-09-03 08:17:21 +0900
commit44815c90210cd858c4a116c3eb35270160cecf81 (patch)
tree602e1b5473b3afb2fbb0a6855da104482c7f361d /scripts
parente54dd93a08228b9942d708b133ad3715d92712b0 (diff)
downloadlinux-stable-44815c90210cd858c4a116c3eb35270160cecf81.tar.gz
linux-stable-44815c90210cd858c4a116c3eb35270160cecf81.tar.bz2
linux-stable-44815c90210cd858c4a116c3eb35270160cecf81.zip
kbuild: clean up objtool_args slightly
The code: $(if $(or $(CONFIG_GCOV_KERNEL),$(CONFIG_LTO_CLANG)), ...) ... can be simpled to: $(if $(CONFIG_GCOV_KERNEL)$(CONFIG_LTO_CLANG), ...) Also, remove meaningless commas at the end of $(if ...). Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib11
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index af1c920a585c..cd011f3f6f78 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -236,13 +236,12 @@ endif
# then here to avoid duplication.
objtool_args = \
$(if $(CONFIG_UNWINDER_ORC),orc generate,check) \
- $(if $(part-of-module), --module,) \
+ $(if $(part-of-module), --module) \
$(if $(CONFIG_FRAME_POINTER),, --no-fp) \
- $(if $(or $(CONFIG_GCOV_KERNEL),$(CONFIG_LTO_CLANG)), \
- --no-unreachable,) \
- $(if $(CONFIG_RETPOLINE), --retpoline,) \
- $(if $(CONFIG_X86_SMAP), --uaccess,) \
- $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount,)
+ $(if $(CONFIG_GCOV_KERNEL)$(CONFIG_LTO_CLANG), --no-unreachable)\
+ $(if $(CONFIG_RETPOLINE), --retpoline) \
+ $(if $(CONFIG_X86_SMAP), --uaccess) \
+ $(if $(CONFIG_FTRACE_MCOUNT_USE_OBJTOOL), --mcount)
# Useful for describing the dependency of composite objects
# Usage: