lkml.org 
[lkml]   [2020]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 06/28] objtool: Don't autodetect vmlinux.o
    From
    With LTO, we run objtool on vmlinux.o, but don't want noinstr
    validation. This change requires --vmlinux to be passed to objtool
    explicitly.

    Suggested-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
    ---
    scripts/link-vmlinux.sh | 2 +-
    tools/objtool/builtin-check.c | 10 +---------
    2 files changed, 2 insertions(+), 10 deletions(-)

    diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
    index e6e2d9e5ff48..372c3719f94c 100755
    --- a/scripts/link-vmlinux.sh
    +++ b/scripts/link-vmlinux.sh
    @@ -64,7 +64,7 @@ objtool_link()
    local objtoolopt;

    if [ -n "${CONFIG_VMLINUX_VALIDATION}" ]; then
    - objtoolopt="check"
    + objtoolopt="check --vmlinux"
    if [ -z "${CONFIG_FRAME_POINTER}" ]; then
    objtoolopt="${objtoolopt} --no-fp"
    fi
    diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
    index 71595cf4946d..eaa06eb18690 100644
    --- a/tools/objtool/builtin-check.c
    +++ b/tools/objtool/builtin-check.c
    @@ -41,18 +41,10 @@ const struct option check_options[] = {

    int cmd_check(int argc, const char **argv)
    {
    - const char *objname, *s;
    -
    argc = parse_options(argc, argv, check_options, check_usage, 0);

    if (argc != 1)
    usage_with_options(check_usage, check_options);

    - objname = argv[0];
    -
    - s = strstr(objname, "vmlinux.o");
    - if (s && !s[9])
    - vmlinux = true;
    -
    - return check(objname, false);
    + return check(argv[0], false);
    }
    --
    2.28.0.402.g5ffc5be6b7-goog
    \
     
     \ /
      Last update: 2020-09-03 22:32    [W:4.035 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site