Merge branch 'perf/probes' into perf/core
Merge reason: add these fixes to 'perf probe'. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
commit
d103d01e4b
|
@ -1,13 +1,22 @@
|
|||
PHONY += posttest
|
||||
|
||||
ifeq ($(KBUILD_VERBOSE),1)
|
||||
postest_verbose = -v
|
||||
posttest_verbose = -v
|
||||
else
|
||||
postest_verbose =
|
||||
posttest_verbose =
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_64BIT),y)
|
||||
posttest_64bit = -y
|
||||
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 -$(CONFIG_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)
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue