lkml.org 
[lkml]   [2015]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 12/36] perf build: Add dwarf unwind objects building
    Date
    Move the dwarf unwind objects building under build
    framework to be included in the libperf build object.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    ---
    tools/perf/Makefile.perf | 9 ---------
    tools/perf/config/Makefile | 2 ++
    tools/perf/util/Build | 3 +++
    3 files changed, 5 insertions(+), 9 deletions(-)

    diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
    index bc9e0fd89c3c..ab5c5542475d 100644
    --- a/tools/perf/Makefile.perf
    +++ b/tools/perf/Makefile.perf
    @@ -346,15 +346,6 @@ ifneq ($(OUTPUT),)
    CFLAGS += -I$(OUTPUT)
    endif

    -ifndef NO_LIBDW_DWARF_UNWIND
    - LIB_OBJS += $(OUTPUT)util/unwind-libdw.o
    - LIB_H += util/unwind-libdw.h
    -endif
    -
    -ifndef NO_LIBUNWIND
    - LIB_OBJS += $(OUTPUT)util/unwind-libunwind.o
    -endif
    -
    ifndef NO_SLANG
    LIB_OBJS += $(OUTPUT)ui/browser.o
    LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 20f00b2effb9..2b4b273cf804 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -414,9 +414,11 @@ ifdef NO_LIBUNWIND
    dwarf-post-unwind := 0
    else
    dwarf-post-unwind-text := libdw
    + $(call detected,CONFIG_LIBDW_DWARF_UNWIND)
    endif
    else
    dwarf-post-unwind-text := libunwind
    + $(call detected,CONFIG_LIBUNWIND)
    # Enable libunwind support by default.
    ifndef NO_LIBDW_DWARF_UNWIND
    NO_LIBDW_DWARF_UNWIND := 1
    diff --git a/tools/perf/util/Build b/tools/perf/util/Build
    index 10630fbe43c1..0401a80bab09 100644
    --- a/tools/perf/util/Build
    +++ b/tools/perf/util/Build
    @@ -85,6 +85,9 @@ endif
    libperf-$(CONFIG_DWARF) += probe-finder.o
    libperf-$(CONFIG_DWARF) += dwarf-aux.o

    +libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
    +libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
    +
    CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
    CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"

    --
    1.9.3


    \
     
     \ /
      Last update: 2015-01-20 18:01    [W:4.184 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site