All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Anton Blanchard <anton@samba.org>,
	Ingo Molnar <mingo@redhat.com>,
	Michael Ellerman <mpe@ellerman.id.au>,
	Paul Mackerras <paulus@samba.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 02/13] perf tools powerpc: Fix build issue when DWARF support is disabled
Date: Mon,  8 Sep 2014 18:17:58 -0300	[thread overview]
Message-ID: <1410211089-28668-3-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1410211089-28668-1-git-send-email-acme@kernel.org>

From: Anton Blanchard <anton@samba.org>

The powerpc skip callchain code uses DWARF, so we must disable it if
DWARF is disabled.

Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20140825182506.2be6512d@kryten
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/arch/powerpc/Makefile |  2 +-
 tools/perf/config/Makefile       | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/perf/arch/powerpc/Makefile b/tools/perf/arch/powerpc/Makefile
index b92219b1900d..6f7782bea5dd 100644
--- a/tools/perf/arch/powerpc/Makefile
+++ b/tools/perf/arch/powerpc/Makefile
@@ -1,6 +1,6 @@
 ifndef NO_DWARF
 PERF_HAVE_DWARF_REGS := 1
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o
+LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
 endif
 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o
-LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 75d4c237b03d..98c9fd174e98 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -48,10 +48,6 @@ ifneq ($(ARCH),$(filter $(ARCH),x86 arm))
   NO_LIBDW_DWARF_UNWIND := 1
 endif
 
-ifeq ($(ARCH),powerpc)
-  CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
-endif
-
 ifeq ($(LIBUNWIND_LIBS),)
   NO_LIBUNWIND := 1
 else
@@ -378,6 +374,12 @@ ifndef NO_LIBELF
   endif # NO_DWARF
 endif # NO_LIBELF
 
+ifeq ($(ARCH),powerpc)
+  ifndef NO_DWARF
+    CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX
+  endif
+endif
+
 ifndef NO_LIBUNWIND
   ifneq ($(feature-libunwind), 1)
     msg := $(warning No libunwind found. Please install libunwind-dev[el] >= 1.1 and/or set LIBUNWIND_DIR);
-- 
1.9.3


  parent reply	other threads:[~2014-09-08 21:18 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-08 21:17 [GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo
2014-09-08 21:17 ` [PATCH 01/13] perf tools: Add +field argument support for --sort option Arnaldo Carvalho de Melo
2014-09-08 21:17 ` Arnaldo Carvalho de Melo [this message]
2014-09-08 21:17 ` [PATCH 03/13] perf kvm stat report: Save pid string in opts.target.pid Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 04/13] perf kvm stat report: Enable the target.system_wide flag Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 05/13] perf kvm stat report: Unify the title bar output Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 06/13] perf tools: Allow to specify lib compile variable for spec usage Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 07/13] perf tools: Add feature checks to .gitignore Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 08/13] perf tools: Let a user specify a PMU event without any config terms Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 09/13] perf tools: Add perf-with-kcore script Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 10/13] perf tools: Build programs to copy 32-bit compatibility VDSOs Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 11/13] perf tools: Add support for " Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 12/13] perf tools: Let default config be defined for a PMU Arnaldo Carvalho de Melo
2014-09-08 21:18 ` [PATCH 13/13] perf tools: Add perf_pmu__scan_file() Arnaldo Carvalho de Melo
2014-09-09  4:59 ` [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar
2014-09-09  7:14   ` Adrian Hunter
2014-09-09  7:45     ` Stephane Eranian
2014-09-09  7:55       ` Adrian Hunter
2014-09-09 14:53     ` Ingo Molnar
2014-09-09  8:48 ` Adrian Hunter
2014-09-09 13:12   ` Arnaldo Carvalho de Melo
2014-09-09 14:54     ` Ingo Molnar
2014-09-09 15:59       ` Arnaldo Carvalho de Melo
2014-09-09 19:08   ` Arnaldo Carvalho de Melo
2014-09-10 13:19     ` Adrian Hunter

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=1410211089-28668-3-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=anton@samba.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=mpe@ellerman.id.au \
    --cc=paulus@samba.org \
    --cc=sukadev@linux.vnet.ibm.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.