Messages in this thread Patch in this message | | | Date | Mon, 20 Jan 2020 08:27:13 -0000 | From | "tip-bot2 for Jin Yao" <> | Subject | [tip: perf/core] perf report: Fix no libunwind compiled warning break s390 issue |
| |
The following commit has been merged into the perf/core branch of tip:
Commit-ID: c3314a74f86dc00827e0945c8e5039fc3aebaa3c Gitweb: https://git.kernel.org/tip/c3314a74f86dc00827e0945c8e5039fc3aebaa3c Author: Jin Yao <yao.jin@linux.intel.com> AuthorDate: Wed, 08 Jan 2020 03:17:45 +08:00 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitterDate: Tue, 14 Jan 2020 12:02:19 -03:00
perf report: Fix no libunwind compiled warning break s390 issue
Commit 800d3f561659 ("perf report: Add warning when libunwind not compiled in") breaks the s390 platform. S390 uses libdw-dwarf-unwind for call chain unwinding and had no support for libunwind.
So the warning "Please install libunwind development packages during the perf build." caused the confusion even if the call-graph is displayed correctly.
This patch adds checking for HAVE_DWARF_SUPPORT, which is set when libdw-dwarf-unwind is compiled in.
Fixes: 800d3f561659 ("perf report: Add warning when libunwind not compiled in") Signed-off-by: Jin Yao <yao.jin@linux.intel.com> Reviewed-by: Thomas Richter <tmricht@linux.ibm.com> Tested-by: Thomas Richter <tmricht@linux.ibm.com> Acked-by: Jiri Olsa <jolsa@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jin Yao <yao.jin@intel.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lore.kernel.org/lkml/20200107191745.18415-1-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/builtin-report.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 627bb65..9483b3f 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -412,10 +412,10 @@ static int report__setup_sample_type(struct report *rep) PERF_SAMPLE_BRANCH_ANY)) rep->nonany_branch_mode = true; -#ifndef HAVE_LIBUNWIND_SUPPORT +#if !defined(HAVE_LIBUNWIND_SUPPORT) && !defined(HAVE_DWARF_SUPPORT) if (dwarf_callchain_users) { - ui__warning("Please install libunwind development packages " - "during the perf build.\n"); + ui__warning("Please install libunwind or libdw " + "development packages during the perf build.\n"); } #endif
| |