Re: [PATCH 3/5] kbuild: clean up objtool_args slightly

[Masahiro Yamada]

On Sat, Aug 28, 2021 at 6:51 PM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxx>
> ---


Applied this to linux-kbuild.
(only 1/5 and 3/5)



>  scripts/Makefile.lib | 11 +++++------
>  1 file 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:
> --
> 2.30.2
>


-- 
Best Regards
Masahiro Yamada