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

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Tested-by: Will Deacon <will.deacon@arm.com>
    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 | 7 -------
    tools/perf/config/Makefile | 1 +
    tools/perf/util/Build | 3 +++
    3 files changed, 4 insertions(+), 7 deletions(-)

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

    -ifndef NO_LIBELF
    -ifndef NO_DWARF
    - LIB_OBJS += $(OUTPUT)util/probe-finder.o
    - LIB_OBJS += $(OUTPUT)util/dwarf-aux.o
    -endif # NO_DWARF
    -endif # NO_LIBELF
    -
    ifndef NO_LIBDW_DWARF_UNWIND
    LIB_OBJS += $(OUTPUT)util/unwind-libdw.o
    LIB_H += util/unwind-libdw.h
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 1a3720f2cdbb..20f00b2effb9 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -386,6 +386,7 @@ ifndef NO_LIBELF
    CFLAGS += -DHAVE_DWARF_SUPPORT $(LIBDW_CFLAGS)
    LDFLAGS += $(LIBDW_LDFLAGS)
    EXTLIBS += -ldw
    + $(call detected,CONFIG_DWARF)
    endif # PERF_HAVE_DWARF_REGS
    endif # NO_DWARF
    endif # NO_LIBELF
    diff --git a/tools/perf/util/Build b/tools/perf/util/Build
    index 73a0411e2014..10630fbe43c1 100644
    --- a/tools/perf/util/Build
    +++ b/tools/perf/util/Build
    @@ -82,6 +82,9 @@ ifndef CONFIG_LIBELF
    libperf-y += symbol-minimal.o
    endif

    +libperf-$(CONFIG_DWARF) += probe-finder.o
    +libperf-$(CONFIG_DWARF) += dwarf-aux.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-26 11:21    [W:5.717 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site