Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1417089

[tip:perf/core] perf unwind: Separate local/remote libunwind config

From tip-bot for He Kuang <tipbot@zytor.com>
Newsgroups linux.kernel
Subject [tip:perf/core] perf unwind: Separate local/remote libunwind config
Date 2016-06-08 10:50 +0200
Message-ID <rHHlw-6ig-51@gated-at.bofh.it> (permalink)
References <rFO7M-6nc-35@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  9d8e14d306ef2f5daf2fd099ef07c39dd83e2c0d
Gitweb:     http://git.kernel.org/tip/9d8e14d306ef2f5daf2fd099ef07c39dd83e2c0d
Author:     He Kuang <hekuang@huawei.com>
AuthorDate: Fri, 3 Jun 2016 03:33:15 +0000
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 7 Jun 2016 12:08:52 -0300

perf unwind: Separate local/remote libunwind config

CONFIG_LIBUNWIND/NO_LIBUNWIND are changed to CONFIG_LOCAL_LIBUNWIND/
NO_LOCAL_LIBUNWIND for retaining local unwind features. The new
CONFIG_LIBUNWIND stands for either local or remote or both unwind are
supported, and NO_LIBUNWIND means that neither local nor remote unwind
is supported.

LIBUNWIND_LIBS is eliminated in LDFLAGS if local libunwind is not
supported.

Signed-off-by: He Kuang <hekuang@huawei.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ekaterina Tumanova <tumanova@linux.vnet.ibm.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1464924803-22214-7-git-send-email-hekuang@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/arch/arm/util/Build   |  2 +-
 tools/perf/arch/arm64/util/Build |  2 +-
 tools/perf/arch/x86/util/Build   |  2 +-
 tools/perf/config/Makefile       | 20 +++++++++++++++++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build
index d22e3d0..f98da17 100644
--- a/tools/perf/arch/arm/util/Build
+++ b/tools/perf/arch/arm/util/Build
@@ -1,4 +1,4 @@
 libperf-$(CONFIG_DWARF) += dwarf-regs.o
 
-libperf-$(CONFIG_LIBUNWIND)          += unwind-libunwind.o
+libperf-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind.o
 libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
diff --git a/tools/perf/arch/arm64/util/Build b/tools/perf/arch/arm64/util/Build
index e58123a8..02f41db 100644
--- a/tools/perf/arch/arm64/util/Build
+++ b/tools/perf/arch/arm64/util/Build
@@ -1,2 +1,2 @@
 libperf-$(CONFIG_DWARF)     += dwarf-regs.o
-libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
+libperf-$(CONFIG_LOCAL_LIBUNWIND) += unwind-libunwind.o
diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build
index 4cd8a16..f95e6f4 100644
--- a/tools/perf/arch/x86/util/Build
+++ b/tools/perf/arch/x86/util/Build
@@ -8,7 +8,7 @@ libperf-y += group.o
 libperf-$(CONFIG_DWARF) += dwarf-regs.o
 libperf-$(CONFIG_BPF_PROLOGUE) += dwarf-regs.o
 
-libperf-$(CONFIG_LIBUNWIND)          += unwind-libunwind.o
+libperf-$(CONFIG_LOCAL_LIBUNWIND)    += unwind-libunwind.o
 libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
 
 libperf-$(CONFIG_AUXTRACE) += auxtrace.o
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 118df2d..3918687 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -353,10 +353,20 @@ ifeq ($(ARCH),powerpc)
 endif
 
 ifndef NO_LIBUNWIND
+  have_libunwind :=
   ifneq ($(feature-libunwind), 1)
     msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
+    NO_LOCAL_LIBUNWIND := 1
+  else
+    have_libunwind := 1
+    $(call detected,CONFIG_LOCAL_LIBUNWIND)
+  endif
+
+  ifneq ($(have_libunwind), 1)
     NO_LIBUNWIND := 1
   endif
+else
+  NO_LOCAL_LIBUNWIND := 1
 endif
 
 ifndef NO_LIBBPF
@@ -394,7 +404,7 @@ else
   NO_DWARF_UNWIND := 1
 endif
 
-ifndef NO_LIBUNWIND
+ifndef NO_LOCAL_LIBUNWIND
   ifeq ($(ARCH),$(filter $(ARCH),arm arm64))
     $(call feature_check,libunwind-debug-frame)
     ifneq ($(feature-libunwind-debug-frame), 1)
@@ -405,10 +415,14 @@ ifndef NO_LIBUNWIND
     # non-ARM has no dwarf_find_debug_frame() function:
     CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME
   endif
-  CFLAGS  += -DHAVE_LIBUNWIND_SUPPORT
   EXTLIBS += $(LIBUNWIND_LIBS)
+  LDFLAGS += $(LIBUNWIND_LIBS)
+endif
+
+ifndef NO_LIBUNWIND
+  CFLAGS  += -DHAVE_LIBUNWIND_SUPPORT
   CFLAGS  += $(LIBUNWIND_CFLAGS)
-  LDFLAGS += $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIBS)
+  LDFLAGS += $(LIBUNWIND_LDFLAGS)
 endif
 
 ifndef NO_LIBAUDIT

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v9 00/14] Add support for remote unwind He Kuang <hekuang@huawei.com> - 2016-06-03 05:40 +0200
  [PATCH v9 14/14] perf callchain: Support aarch64 cross-platform He Kuang <hekuang@huawei.com> - 2016-06-03 05:40 +0200
    [tip:perf/core] perf callchain: Support aarch64 cross-platform tip-bot for He Kuang <tipbot@zytor.com> - 2016-06-08 11:00 +0200
  [PATCH v9 06/14] perf tools: Separate local/remote libunwind config He Kuang <hekuang@huawei.com> - 2016-06-03 05:40 +0200
    [tip:perf/core] perf unwind: Separate local/remote libunwind config tip-bot for He Kuang <tipbot@zytor.com> - 2016-06-08 10:50 +0200
  [PATCH v9 11/14] perf tools: Change fixed name of libunwind__arch_reg_id to macro He Kuang <hekuang@huawei.com> - 2016-06-03 05:40 +0200
    [tip:perf/core] perf unwind: Change fixed name of  libunwind__arch_reg_id to macro tip-bot for He Kuang <tipbot@zytor.com> - 2016-06-08 11:00 +0200
  [PATCH v9 09/14] perf tools: Export normalize_arch() function He Kuang <hekuang@huawei.com> - 2016-06-03 05:40 +0200
    [tip:perf/core] perf tools: Export normalize_arch() function tip-bot for He Kuang <tipbot@zytor.com> - 2016-06-08 11:00 +0200
  [PATCH v9 02/14] perf tools: Decouple thread->address_space on libunwind He Kuang <hekuang@huawei.com> - 2016-06-03 05:40 +0200
    [tip:perf/core] perf unwind: Decouple thread->address_space on  libunwind tip-bot for He Kuang <tipbot@zytor.com> - 2016-06-08 10:50 +0200
  Re: [PATCH v9 00/14] Add support for remote unwind Jiri Olsa <jolsa@redhat.com> - 2016-06-03 09:10 +0200
    Re: [PATCH v9 00/14] Add support for remote unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-03 21:50 +0200
      Re: [PATCH v9 00/14] Add support for remote unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-03 23:10 +0200
        Re: [PATCH v9 00/14] Add support for remote unwind Hekuang <hekuang@huawei.com> - 2016-06-04 07:50 +0200
          Re: [PATCH v9 00/14] Add support for remote unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-07 17:20 +0200
          Re: [PATCH v9 00/14] Add support for remote unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-07 17:20 +0200
      Re: [PATCH v9 00/14] Add support for remote unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-03 23:10 +0200
    Re: [PATCH v9 00/14] Add support for remote unwind Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-06-07 21:50 +0200
      Re: [PATCH v9 00/14] Add support for remote unwind Hekuang <hekuang@huawei.com> - 2016-06-08 09:40 +0200

csiph-web