Commit 8bee738b authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by H. Peter Anvin

x86: Fix objdump version check in chkobjdump.awk for different formats.

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.

Changes in v2:
 - Remove unneeded increment.
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@redhat.com>
LKML-Reference: <20091218154012.16960.5113.stgit@dhcp-100-2-132.bos.redhat.com>
Suggested-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 18374d89
...@@ -8,14 +8,24 @@ BEGIN { ...@@ -8,14 +8,24 @@ BEGIN {
od_sver = 19; od_sver = 19;
} }
/^GNU/ { /^GNU objdump/ {
split($3, ver, "."); 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 || if (ver[1] > od_ver ||
(ver[1] == od_ver && ver[2] >= od_sver)) { (ver[1] == od_ver && ver[2] >= od_sver)) {
exit 1; exit 1;
} else { } else {
printf("Warning: objdump version %s is older than %d.%d\n", 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."); print("Warning: Skipping posttest.");
# Logic is inverted, because we just skip test without error. # Logic is inverted, because we just skip test without error.
exit 0; exit 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment