Messages in this thread Patch in this message | | | From | David Ahern <> | Subject | [PATCH 21/23] perf: consolidate CONFIG_DWARF checks in Makefile | Date | Mon, 1 Apr 2013 21:54:35 -0600 |
| |
Signed-off-by: David Ahern <dsahern@gmail.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> --- tools/perf/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index a3a62611..5037856 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -563,6 +563,11 @@ ifdef CONFIG_LIBELF LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib endif + FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) + ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y) + BASIC_CFLAGS += -DLIBELF_MMAP + endif + # libelf supported - what about dwarf? ifdef CONFIG_DWARF FLAGS_DWARF=$(ALL_CFLAGS) $(LIBDW_CFLAGS) -ldw -lelf $(LIBDW_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) @@ -570,14 +575,7 @@ ifdef CONFIG_LIBELF $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138.ables dwarf support.) $(error Please install new elfutils-devel/libdw-dev or disable CONFIG_DWARF); endif - endif - FLAGS_LIBELF=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) - ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y) - BASIC_CFLAGS += -DLIBELF_MMAP - endif - - ifdef CONFIG_DWARF ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); else -- 1.7.10.1
| |