lkml.org 
[lkml]   [2022]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/core] objtool: Rename --duplicate to --lto
    The following commit has been merged into the x86/core branch of tip:

    Commit-ID: 5af720d0563adc652ac1e98bc4ab423ba1336927
    Gitweb: https://git.kernel.org/tip/5af720d0563adc652ac1e98bc4ab423ba1336927
    Author: Peter Zijlstra <peterz@infradead.org>
    AuthorDate: Tue, 08 Mar 2022 16:30:45 +01:00
    Committer: Peter Zijlstra <peterz@infradead.org>
    CommitterDate: Tue, 08 Mar 2022 23:53:36 +01:00

    objtool: Rename --duplicate to --lto

    In order to prepare for LTO like objtool runs for modules, rename the
    duplicate argument to lto.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Link: https://lore.kernel.org/r/20220308154319.172584233@infradead.org
    ---
    scripts/link-vmlinux.sh | 2 +-
    tools/objtool/builtin-check.c | 4 ++--
    tools/objtool/check.c | 7 ++++++-
    tools/objtool/include/objtool/builtin.h | 2 +-
    4 files changed, 10 insertions(+), 5 deletions(-)

    diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
    index 666f7bb..9b08dca 100755
    --- a/scripts/link-vmlinux.sh
    +++ b/scripts/link-vmlinux.sh
    @@ -115,7 +115,7 @@ objtool_link()
    objtoolcmd="orc generate"
    fi

    - objtoolopt="${objtoolopt} --duplicate"
    + objtoolopt="${objtoolopt} --lto"

    if is_enabled CONFIG_FTRACE_MCOUNT_USE_OBJTOOL; then
    objtoolopt="${objtoolopt} --mcount"
    diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
    index 853af93..5c2fcaa 100644
    --- a/tools/objtool/builtin-check.c
    +++ b/tools/objtool/builtin-check.c
    @@ -20,7 +20,7 @@
    #include <objtool/objtool.h>

    bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,
    - validate_dup, vmlinux, mcount, noinstr, backup, sls, dryrun;
    + lto, vmlinux, mcount, noinstr, backup, sls, dryrun;

    static const char * const check_usage[] = {
    "objtool check [<options>] file.o",
    @@ -40,7 +40,7 @@ const struct option check_options[] = {
    OPT_BOOLEAN('b', "backtrace", &backtrace, "unwind on error"),
    OPT_BOOLEAN('a', "uaccess", &uaccess, "enable uaccess checking"),
    OPT_BOOLEAN('s', "stats", &stats, "print statistics"),
    - OPT_BOOLEAN('d', "duplicate", &validate_dup, "duplicate validation for vmlinux.o"),
    + OPT_BOOLEAN(0, "lto", &lto, "whole-archive like runs"),
    OPT_BOOLEAN('n', "noinstr", &noinstr, "noinstr validation for vmlinux.o"),
    OPT_BOOLEAN('l', "vmlinux", &vmlinux, "vmlinux.o validation"),
    OPT_BOOLEAN('M', "mcount", &mcount, "generate __mcount_loc"),
    diff --git a/tools/objtool/check.c b/tools/objtool/check.c
    index 311bfc6..ae1d4f9 100644
    --- a/tools/objtool/check.c
    +++ b/tools/objtool/check.c
    @@ -3499,6 +3499,11 @@ int check(struct objtool_file *file)
    {
    int ret, warnings = 0;

    + if (lto && !(vmlinux || module)) {
    + fprintf(stderr, "--lto requires: --vmlinux or --module\n");
    + return 1;
    + }
    +
    arch_initial_func_cfi_state(&initial_func_cfi);
    init_cfi_state(&init_cfi);
    init_cfi_state(&func_cfi);
    @@ -3519,7 +3524,7 @@ int check(struct objtool_file *file)
    if (list_empty(&file->insn_list))
    goto out;

    - if (vmlinux && !validate_dup) {
    + if (vmlinux && !lto) {
    ret = validate_vmlinux_functions(file);
    if (ret < 0)
    goto out;
    diff --git a/tools/objtool/include/objtool/builtin.h b/tools/objtool/include/objtool/builtin.h
    index 7b4b124..0cbe739 100644
    --- a/tools/objtool/include/objtool/builtin.h
    +++ b/tools/objtool/include/objtool/builtin.h
    @@ -9,7 +9,7 @@

    extern const struct option check_options[];
    extern bool no_fp, no_unreachable, retpoline, module, backtrace, uaccess, stats,
    - validate_dup, vmlinux, mcount, noinstr, backup, sls, dryrun;
    + lto, vmlinux, mcount, noinstr, backup, sls, dryrun;

    extern int cmd_parse_options(int argc, const char **argv, const char * const usage[]);

    \
     
     \ /
      Last update: 2022-03-09 08:56    [W:4.057 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site