lkml.org 
[lkml]   [2009]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH x86/urgent] x86: Fix objdump version check in chkobjdump.awk for different formats.
    Date
    Different version of objdump says its version in different way;

    GNU objdump 2.16.1

    or

    GNU objdump version 2.19.51.0.14-1.fc11 20090722

    This patch uses the first argument which starts with a number
    as version string.

    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Suggested-by: H. Peter Anvin <hpa@zytor.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    ---

    arch/x86/tools/chkobjdump.awk | 16 +++++++++++++---
    1 files changed, 13 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/tools/chkobjdump.awk b/arch/x86/tools/chkobjdump.awk
    index 5bbb5a3..250dc79 100644
    --- a/arch/x86/tools/chkobjdump.awk
    +++ b/arch/x86/tools/chkobjdump.awk
    @@ -8,14 +8,24 @@ BEGIN {
    od_sver = 19;
    }

    -/^GNU/ {
    - split($3, ver, ".");
    +/^GNU objdump/ {
    + verstr = ""
    + for (i = 3; i <= NF; i++)
    + if (match($(i), "^[0-9]")) {
    + verstr = $(i++);
    + break;
    + }
    + if (verstr == "") {
    + printf("Warning: Failed to find objdump version number.\n");
    + exit 0;
    + }
    + split(verstr, ver, ".");
    if (ver[1] > od_ver ||
    (ver[1] == od_ver && ver[2] >= od_sver)) {
    exit 1;
    } else {
    printf("Warning: objdump version %s is older than %d.%d\n",
    - $4, od_ver, od_sver);
    + verstr, od_ver, od_sver);
    print("Warning: Skipping posttest.");
    # Logic is inverted, because we just skip test without error.
    exit 0;

    --
    Masami Hiramatsu

    Software Engineer
    Hitachi Computer Products (America), Inc.
    Software Solutions Division

    e-mail: mhiramat@redhat.com


    \
     
     \ /
      Last update: 2009-12-18 16:33    [W:0.023 / U:30.304 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site