Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65ccb4fa authored by Anton Blanchard's avatar Anton Blanchard Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarAnton 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1a1c0ffb

tools/perf/arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line 
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

tools/perf/config/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -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);