Commit 8bee738b authored Dec 18, 2009 by Masami Hiramatsu Committed by H. Peter Anvin Dec 18, 2009

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: Masami Hiramatsu <mhiramat@redhat.com>
LKML-Reference: <20091218154012.16960.5113.stgit@dhcp-100-2-132.bos.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>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

parent 18374d89

arch/x86/tools/chkobjdump.awk

+13 −3

Original line number	Diff line number	Diff line
		@@ -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;