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 <an...@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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
