linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: He Kuang <hekuang@huawei.com>
To: <peterz@infradead.org>, <mingo@redhat.com>, <acme@kernel.org>,
	<alexander.shishkin@linux.intel.com>, <jolsa@redhat.com>,
	<wangnan0@huawei.com>, <hekuang@huawei.com>,
	<jpoimboe@redhat.com>, <ak@linux.intel.com>, <eranian@google.com>,
	<namhyung@kernel.org>, <adrian.hunter@intel.com>,
	<sukadev@linux.vnet.ibm.com>, <masami.hiramatsu.pt@hitachi.com>,
	<tumanova@linux.vnet.ibm.com>, <kan.liang@intel.com>,
	<penberg@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH v9 06/14] perf tools: Separate local/remote libunwind config
Date: Fri, 3 Jun 2016 03:33:15 +0000	[thread overview]
Message-ID: <1464924803-22214-7-git-send-email-hekuang@huawei.com> (raw)
In-Reply-To: <1464924803-22214-1-git-send-email-hekuang@huawei.com>

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>
---
 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 4659703..bc24b75 100644
--- a/tools/perf/arch/x86/util/Build
+++ b/tools/perf/arch/x86/util/Build
@@ -7,7 +7,7 @@ libperf-y += perf_regs.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
-- 
1.8.5.2

  parent reply	other threads:[~2016-06-03  3:37 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03  3:33 [PATCH v9 00/14] Add support for remote unwind He Kuang
2016-06-03  3:33 ` [PATCH v9 01/14] perf tools: Use LIBUNWIND_DIR for remote libunwind feature check He Kuang
2016-06-08  8:45   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 02/14] perf tools: Decouple thread->address_space on libunwind He Kuang
2016-06-08  8:46   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 03/14] perf tools: Introducing struct unwind_libunwind_ops for local unwind He Kuang
2016-06-08  8:46   ` [tip:perf/core] perf unwind: Introduce 'struct unwind_libunwind_ops' " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 04/14] perf tools: Move unwind__prepare_access from thread_new into thread__insert_map He Kuang
2016-06-08  8:47   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 05/14] perf tools: Don't mix LIBUNWIND_LIBS into LIBUNWIND_LDFLAGS He Kuang
2016-06-08  8:47   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` He Kuang [this message]
2016-06-08  8:47   ` [tip:perf/core] perf unwind: Separate local/remote libunwind config tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 07/14] perf tools: Rename unwind-libunwind.c to unwind-libunwind-local.c He Kuang
2016-06-08  8:48   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 08/14] perf tools: Extract common API out of unwind-libunwind-local.c He Kuang
2016-06-08  8:48   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 09/14] perf tools: Export normalize_arch() function He Kuang
2016-06-08  8:49   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 10/14] perf tools: Check the target platform before assigning unwind methods He Kuang
2016-06-04  5:36   ` [PATCH v9 10/14 UPDATE] " He Kuang
2016-06-07 18:06     ` Arnaldo Carvalho de Melo
2016-06-08  8:49   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 11/14] perf tools: Change fixed name of libunwind__arch_reg_id to macro He Kuang
2016-06-08  8:50   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 12/14] perf tools: Introduce flag to separate local/remote unwind compilation He Kuang
2016-06-08  8:50   ` [tip:perf/core] perf unwind: " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 13/14] perf callchain: Support x86 target platform He Kuang
2016-06-08  8:51   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  3:33 ` [PATCH v9 14/14] perf callchain: Support aarch64 cross-platform He Kuang
2016-06-08  8:51   ` [tip:perf/core] " tip-bot for He Kuang
2016-06-03  7:06 ` [PATCH v9 00/14] Add support for remote unwind Jiri Olsa
2016-06-03 19:42   ` Arnaldo Carvalho de Melo
2016-06-03 21:06     ` Arnaldo Carvalho de Melo
2016-06-03 21:09       ` Arnaldo Carvalho de Melo
2016-06-04  5:39         ` Hekuang
2016-06-07 15:12           ` Arnaldo Carvalho de Melo
2016-06-07 15:14             ` Arnaldo Carvalho de Melo
2016-06-07 19:44   ` Arnaldo Carvalho de Melo
2016-06-08  7:33     ` Hekuang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464924803-22214-7-git-send-email-hekuang@huawei.com \
    --to=hekuang@huawei.com \
    --cc=acme@kernel.org \
    --cc=adrian.hunter@intel.com \
    --cc=ak@linux.intel.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=eranian@google.com \
    --cc=jolsa@redhat.com \
    --cc=jpoimboe@redhat.com \
    --cc=kan.liang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=penberg@kernel.org \
    --cc=peterz@infradead.org \
    --cc=sukadev@linux.vnet.ibm.com \
    --cc=tumanova@linux.vnet.ibm.com \
    --cc=wangnan0@huawei.com \
    --subject='Re: [PATCH v9 06/14] perf tools: Separate local/remote libunwind config' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).