| From c3314a74f86dc00827e0945c8e5039fc3aebaa3c Mon Sep 17 00:00:00 2001 |
| From: Jin Yao <yao.jin@linux.intel.com> |
| Date: Wed, 8 Jan 2020 03:17:45 +0800 |
| Subject: perf report: Fix no libunwind compiled warning break s390 issue |
| |
| From: Jin Yao <yao.jin@linux.intel.com> |
| |
| commit c3314a74f86dc00827e0945c8e5039fc3aebaa3c upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/builtin-report.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/tools/perf/builtin-report.c |
| +++ b/tools/perf/builtin-report.c |
| @@ -412,10 +412,10 @@ static int report__setup_sample_type(str |
| 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 |
| |
