Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d103d01e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/probes' into perf/core



Merge reason: add these fixes to 'perf probe'.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 26fb20d0 6f5f6726
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
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)
+23 −0
Original line number Diff line number Diff line
# 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;
	}
}