* [PATCH 1/2] perf powerpc: Skip callchain code must include util/debug.h
@ 2014-08-25 8:23 Anton Blanchard
2014-08-25 8:25 ` [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled Anton Blanchard
2014-08-25 21:22 ` [PATCH 1/2] perf powerpc: Skip callchain code must include util/debug.h Sukadev Bhattiprolu
0 siblings, 2 replies; 5+ messages in thread
From: Anton Blanchard @ 2014-08-25 8:23 UTC (permalink / raw)
To: sukadev, mpe, acme, a.p.zijlstra, paulus, mingo; +Cc: linux-kernel
Fix a compile error, the prototype for pr_debug could not be found.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
===================================================================
--- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c
+++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
@@ -15,6 +15,7 @@
#include "util/thread.h"
#include "util/callchain.h"
+#include "util/debug.h"
/*
* When saving the callchain on Power, the kernel conservatively saves
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled
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
2014-08-26 13:18 ` 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
1 sibling, 2 replies; 5+ messages in thread
From: Anton Blanchard @ 2014-08-25 8:25 UTC (permalink / raw)
To: sukadev, mpe, acme, a.p.zijlstra, paulus, mingo; +Cc: linux-kernel
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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] perf powerpc: Skip callchain code must include util/debug.h
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 ` [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled Anton Blanchard
@ 2014-08-25 21:22 ` Sukadev Bhattiprolu
1 sibling, 0 replies; 5+ messages in thread
From: Sukadev Bhattiprolu @ 2014-08-25 21:22 UTC (permalink / raw)
To: Anton Blanchard; +Cc: mpe, acme, a.p.zijlstra, paulus, mingo, linux-kernel
Anton Blanchard [anton@samba.org] wrote:
| Fix a compile error, the prototype for pr_debug could not be found.
|
Arnaldo pushed this patch to Ingo recently.
https://lkml.org/lkml/2014/8/22/393
| Signed-off-by: Anton Blanchard <anton@samba.org>
| ---
|
| Index: b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
| ===================================================================
| --- a/tools/perf/arch/powerpc/util/skip-callchain-idx.c
| +++ b/tools/perf/arch/powerpc/util/skip-callchain-idx.c
| @@ -15,6 +15,7 @@
|
| #include "util/thread.h"
| #include "util/callchain.h"
| +#include "util/debug.h"
|
| /*
| * When saving the callchain on Power, the kernel conservatively saves
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled
2014-08-25 8:25 ` [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled Anton Blanchard
@ 2014-08-26 13:18 ` Arnaldo Carvalho de Melo
2014-09-19 5:19 ` [tip:perf/core] perf tools " tip-bot for Anton Blanchard
1 sibling, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2014-08-26 13:18 UTC (permalink / raw)
To: Anton Blanchard; +Cc: sukadev, mpe, a.p.zijlstra, paulus, mingo, linux-kernel
Em Mon, Aug 25, 2014 at 06:25:06PM +1000, Anton Blanchard escreveu:
> The powerpc skip callchain code uses DWARF, so we must disable it if
> DWARF is disabled.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
Thanks, applied.
- Arnaldo
>
> 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);
^ permalink raw reply [flat|nested] 5+ messages in thread
* [tip:perf/core] perf tools powerpc: Fix build issue when DWARF support is disabled
2014-08-25 8:25 ` [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled Anton Blanchard
2014-08-26 13:18 ` Arnaldo Carvalho de Melo
@ 2014-09-19 5:19 ` tip-bot for Anton Blanchard
1 sibling, 0 replies; 5+ messages in thread
From: tip-bot for Anton Blanchard @ 2014-09-19 5:19 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, linux-kernel, paulus, mingo, anton, hpa, mingo,
a.p.zijlstra, mpe, sukadev, tglx
Commit-ID: 65ccb4faae872b63dd8f5fbc83d0195e3dfabf0d
Gitweb: http://git.kernel.org/tip/65ccb4faae872b63dd8f5fbc83d0195e3dfabf0d
Author: Anton Blanchard <anton@samba.org>
AuthorDate: Mon, 25 Aug 2014 18:25:06 +1000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 17 Sep 2014 17:08:07 -0300
perf tools powerpc: Fix build issue when DWARF support is disabled
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 b92219b..6f7782b 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 75d4c23..98c9fd1 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);
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-19 5:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 2/2] perf powerpc: Fix build issue when DWARF support is disabled Anton Blanchard
2014-08-26 13:18 ` 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
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).