lkml.org 
[lkml]   [2013]   [Oct]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/50] tools/perf/build: Clean up the mmap logic in config/Makefile
    Date
    Nest the rules properly. No change in functionality.

    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Link: http://lkml.kernel.org/n/tip-wwktuHl4Ra5lyrrretkxmxqf@git.kernel.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    tools/perf/config/Makefile | 51 ++++++++++++++++++++++++++-------------------------
    1 file changed, 26 insertions(+), 25 deletions(-)

    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 3695135..3129c2d 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -198,37 +198,38 @@ else
    endif # NO_LIBELF

    ifndef NO_LIBELF
    -CFLAGS += -DHAVE_LIBELF_SUPPORT
    -FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
    -ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DHAVE_LIBELF_MMAP_SUPPORT),y)
    - CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
    -endif
    -ifeq ($(call try-cc,$(SOURCE_ELF_GETPHDRNUM),$(FLAGS_LIBELF),-DHAVE_ELF_GETPHDRNUM_SUPPORT),y)
    - CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT
    -endif
    + CFLAGS += -DHAVE_LIBELF_SUPPORT
    + FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)

    -# include ARCH specific config
    --include $(src-perf)/arch/$(ARCH)/Makefile
    + ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DHAVE_LIBELF_MMAP_SUPPORT),y)
    + CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
    + endif

    -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);
    - NO_DWARF := 1
    -else
    - CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
    - LDFLAGS += $(LIBDW_LDFLAGS)
    - EXTLIBS += -lelf -ldw
    -endif # PERF_HAVE_DWARF_REGS
    -endif # NO_DWARF
    + ifeq ($(call try-cc,$(SOURCE_ELF_GETPHDRNUM),$(FLAGS_LIBELF),-DHAVE_ELF_GETPHDRNUM_SUPPORT),y)
    + CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT
    + endif
    +
    + # include ARCH specific config
    + -include $(src-perf)/arch/$(ARCH)/Makefile

    + 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);
    + NO_DWARF := 1
    + else
    + CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
    + LDFLAGS += $(LIBDW_LDFLAGS)
    + EXTLIBS += -lelf -ldw
    + endif # PERF_HAVE_DWARF_REGS
    + endif # NO_DWARF
    endif # NO_LIBELF

    ifndef NO_LIBELF
    -CFLAGS += -DHAVE_LIBELF_SUPPORT
    -FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
    -ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DHAVE_LIBELF_MMAP_SUPPORT),y)
    - CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
    -endif # try-cc
    + CFLAGS += -DHAVE_LIBELF_SUPPORT
    + FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
    + ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DHAVE_LIBELF_MMAP_SUPPORT),y)
    + CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT
    + endif # try-cc
    endif # NO_LIBELF

    # There's only x86 (both 32 and 64) support for CFI unwind so far
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-10-07 14:41    [W:4.252 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site