From: Anton Blanchard <anton@samba.org>
To: sukadev@linux.vnet.ibm.com, mpe@ellerman.id.au, acme@redhat.com,
a.p.zijlstra@chello.nl, paulus@samba.org, mingo@redhat.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled
Date: Mon, 25 Aug 2014 18:25:06 +1000 [thread overview]
Message-ID: <20140825182506.2be6512d@kryten> (raw)
In-Reply-To: <20140825182307.49774a04@kryten>
The powerpc skip callchain code uses DWARF, so we must disable it if
DWARF is disabled.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: b/tools/perf/arch/powerpc/Makefile
===================================================================
--- 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
Index: b/tools/perf/config/Makefile
===================================================================
--- 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
@@ -355,6 +351,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);
next prev parent reply other threads:[~2014-08-25 8:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-25 8:23 [PATCH 1/2] perf powerpc: Skip callchain code must include util/debug.h Anton Blanchard
2014-08-25 8:25 ` Anton Blanchard [this message]
2014-08-26 13:18 ` [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled Arnaldo Carvalho de Melo
2014-09-19 5:19 ` [tip:perf/core] perf tools " tip-bot for Anton Blanchard
2014-08-25 21:22 ` [PATCH 1/2] perf powerpc: Skip callchain code must include util/debug.h Sukadev Bhattiprolu
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=20140825182506.2be6512d@kryten \
--to=anton@samba.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox