diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2012-09-28 05:31:57 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-28 20:07:36 -0400 |
commit | fee9e3732a377275a99b6f3c8b4e1f1569f17575 (patch) | |
tree | 8e00a96e78aaea4c63959320a8fdd3e981103ff8 | |
parent | 1d787d37c8ff6612b8151c6dff15bfa7347bcbdf (diff) |
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: Namhyung 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: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index e5e71e7d95a0..834f09fa5c62 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile | |||
@@ -486,7 +486,13 @@ ifneq ($(call try-cc,$(SOURCE_LIBELF),$(FLAGS_LIBELF)),y) | |||
486 | NO_DWARF := 1 | 486 | NO_DWARF := 1 |
487 | NO_DEMANGLE := 1 | 487 | NO_DEMANGLE := 1 |
488 | endif | 488 | endif |
489 | endif | 489 | else |
490 | FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) | ||
491 | ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y) | ||
492 | 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); | ||
493 | NO_DWARF := 1 | ||
494 | endif # Dwarf support | ||
495 | endif # SOURCE_LIBELF | ||
490 | endif # NO_LIBELF | 496 | endif # NO_LIBELF |
491 | 497 | ||
492 | ifndef NO_LIBUNWIND | 498 | ifndef NO_LIBUNWIND |
@@ -532,12 +538,6 @@ ifneq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_COMMON)),y) | |||
532 | BASIC_CFLAGS += -DLIBELF_NO_MMAP | 538 | BASIC_CFLAGS += -DLIBELF_NO_MMAP |
533 | endif | 539 | endif |
534 | 540 | ||
535 | FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) | ||
536 | ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y) | ||
537 | 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); | ||
538 | NO_DWARF := 1 | ||
539 | endif # Dwarf support | ||
540 | |||
541 | ifndef NO_DWARF | 541 | ifndef NO_DWARF |
542 | ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) | 542 | ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) |
543 | msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); | 543 | msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); |