Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 169879
b: refs/heads/master
c: 6f5f672
h: refs/heads/master
i:
  169877: 0765278
  169875: ee205ed
  169871: 67da75e
v: v3
  • Loading branch information
Masami Hiramatsu authored and H. Peter Anvin committed Nov 21, 2009
1 parent d832a77 commit 8a499d1
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 80509e27e40d7554e576405ed9f5b7966c567112
refs/heads/master: 6f5f67267dc4faecd9cba63894de92ca92a608b8
5 changes: 4 additions & 1 deletion trunk/arch/x86/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ else
posttest_64bit = -n
endif

distill_awk = $(srctree)/arch/x86/tools/distill.awk
chkobjdump = $(srctree)/arch/x86/tools/chkobjdump.awk

quiet_cmd_posttest = TEST $@
cmd_posttest = $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(srctree)/arch/x86/tools/distill.awk | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)
cmd_posttest = ($(OBJDUMP) -v | $(AWK) -f $(chkobjdump)) || $(OBJDUMP) -d -j .text $(objtree)/vmlinux | $(AWK) -f $(distill_awk) | $(obj)/test_get_len $(posttest_64bit) $(posttest_verbose)

posttest: $(obj)/test_get_len vmlinux
$(call cmd,posttest)
Expand Down
23 changes: 23 additions & 0 deletions trunk/arch/x86/tools/chkobjdump.awk
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# GNU objdump version checker
#
# Usage:
# objdump -v | awk -f chkobjdump.awk
BEGIN {
# objdump version 2.19 or later is OK for the test.
od_ver = 2;
od_sver = 19;
}

/^GNU/ {
split($4, 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);
print("Warning: Skipping posttest.");
# Logic is inverted, because we just skip test without error.
exit 0;
}
}

0 comments on commit 8a499d1

Please sign in to comment.