Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anton Blanchard and committed by
Arnaldo Carvalho de Melo
65ccb4fa 1a1c0ffb

+7 -5
+1 -1
tools/perf/arch/powerpc/Makefile
··· 1 1 ifndef NO_DWARF 2 2 PERF_HAVE_DWARF_REGS := 1 3 3 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o 4 + LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o 4 5 endif 5 6 LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o 6 - LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/skip-callchain-idx.o
+6 -4
tools/perf/config/Makefile
··· 48 48 NO_LIBDW_DWARF_UNWIND := 1 49 49 endif 50 50 51 - ifeq ($(ARCH),powerpc) 52 - CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX 53 - endif 54 - 55 51 ifeq ($(LIBUNWIND_LIBS),) 56 52 NO_LIBUNWIND := 1 57 53 else ··· 373 377 endif # PERF_HAVE_DWARF_REGS 374 378 endif # NO_DWARF 375 379 endif # NO_LIBELF 380 + 381 + ifeq ($(ARCH),powerpc) 382 + ifndef NO_DWARF 383 + CFLAGS += -DHAVE_SKIP_CALLCHAIN_IDX 384 + endif 385 + endif 376 386 377 387 ifndef NO_LIBUNWIND 378 388 ifneq ($(feature-libunwind), 1)