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

Commit fee9e373 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Move libdw availability check before arch Makefile 



Since NO_DWARF is used in arch/$(ARCH)/Makefiles, it should be checked
before including those files.  It was moved by mistake during libelf
dependency removal work by me, sorry.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1348824728-14025-2-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1d787d37

tools/perf/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -486,7 +486,13 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) 
		NO_DWARF := 1

		NO_DEMANGLE := 1

	endif

endif

else

	FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS)

	ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y)

		msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);

		NO_DWARF := 1

	endif # Dwarf support

endif # SOURCE_LIBELF

endif # NO_LIBELF



ifndef NO_LIBUNWIND
@@ -532,12 +538,6 @@ ifneq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON)),y) 
	BASIC_CFLAGS += -DLIBELF_NO_MMAP

endif



FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS)

ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y)

	msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev);

	NO_DWARF := 1

endif # Dwarf support



ifndef NO_DWARF

ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)

	msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);