lkml.org 
[lkml]   [2021]   [Aug]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 01/13] kbuild: move objtool_args back to scripts/Makefile.build
    Date
    Commit b1a1a1a09b46 ("kbuild: lto: postpone objtool") moved objtool_args
    to Makefile.lib, so the arguments can be used in Makefile.modfinal as
    well as Makefile.build.

    With commit 2b1d7fc05467 ("kbuild: Fix TRIM_UNUSED_KSYMS with
    LTO_CLANG"), module LTO linking came back to scripts/Makefile.build
    again.

    So, there is no more reason to keep objtool_args in a separate file.

    Get it back to the original place, close to the objtool command.

    Remove the stale comment too.

    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    ---

    scripts/Makefile.build | 10 ++++++++++
    scripts/Makefile.lib | 11 -----------
    2 files changed, 10 insertions(+), 11 deletions(-)

    diff --git a/scripts/Makefile.build b/scripts/Makefile.build
    index 3efc984d4c69..17508c0e4358 100644
    --- a/scripts/Makefile.build
    +++ b/scripts/Makefile.build
    @@ -224,6 +224,16 @@ cmd_record_mcount = $(if $(findstring $(strip $(CC_FLAGS_FTRACE)),$(_c_flags)),
    endif # CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT

    ifdef CONFIG_STACK_VALIDATION
    +
    +objtool_args = \
    + $(if $(CONFIG_UNWINDER_ORC),orc generate,check) \
    + $(if $(part-of-module), --module) \
    + $(if $(CONFIG_FRAME_POINTER),, --no-fp) \
    + $(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)
    +
    ifndef CONFIG_LTO_CLANG

    __objtool_obj := $(objtree)/tools/objtool/objtool
    diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
    index cd011f3f6f78..34c4c11c4bc1 100644
    --- a/scripts/Makefile.lib
    +++ b/scripts/Makefile.lib
    @@ -232,17 +232,6 @@ ifeq ($(CONFIG_LTO_CLANG),y)
    mod-prelink-ext := .lto
    endif

    -# Objtool arguments are also needed for modfinal with LTO, so we define
    -# then here to avoid duplication.
    -objtool_args = \
    - $(if $(CONFIG_UNWINDER_ORC),orc generate,check) \
    - $(if $(part-of-module), --module) \
    - $(if $(CONFIG_FRAME_POINTER),, --no-fp) \
    - $(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:
    # $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add)
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-08-31 09:41    [W:7.384 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site