Skip to content

Commit c3314a7

Browse files
Jin Yaoacmel
authored andcommitted
perf report: Fix no libunwind compiled warning break s390 issue
Commit 800d3f5 ("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: 800d3f5 ("perf report: Add warning when libunwind not compiled in") Signed-off-by: Jin Yao <[email protected]> Reviewed-by: Thomas Richter <[email protected]> Tested-by: Thomas Richter <[email protected]> Acked-by: Jiri Olsa <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Jin Yao <[email protected]> Cc: Kan Liang <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: http://lore.kernel.org/lkml/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 3b0b16b commit c3314a7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/perf/builtin-report.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,10 +412,10 @@ static int report__setup_sample_type(struct report *rep)
412412
PERF_SAMPLE_BRANCH_ANY))
413413
rep->nonany_branch_mode = true;
414414

415-
#ifndef HAVE_LIBUNWIND_SUPPORT
415+
#if !defined(HAVE_LIBUNWIND_SUPPORT) && !defined(HAVE_DWARF_SUPPORT)
416416
if (dwarf_callchain_users) {
417-
ui__warning("Please install libunwind development packages "
418-
"during the perf build.\n");
417+
ui__warning("Please install libunwind or libdw "
418+
"development packages during the perf build.\n");
419419
}
420420
#endif
421421

0 commit comments

Comments
 (0)