lkml.org 
[lkml]   [2012]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/16] perf, tool: Add libunwind dependency for dwarf cfi unwinding
    Date
    Adding libunwind to be linked with perf if available. It's required
    for the to get dwarf cfi unwinding support.

    Also building perf with the dwarf call frame informations by default,
    so that we can unwind callchains in perf itself.

    Adding LIBUNWIND_DIR Makefile variable allowing user to specify
    the directory with libunwind to be linked. This is used for
    debug purposes.

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    ---
    tools/perf/Makefile | 27 ++++++++++++++++++++++++++-
    tools/perf/config/feature-tests.mak | 25 +++++++++++++++++++++++++
    2 files changed, 51 insertions(+), 1 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 4ce268c..01d67ec 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -59,6 +59,7 @@ AR = $(CROSS_COMPILE)ar
    ifeq ($(ARCH),i386)
    ARCH := x86
    NO_PERF_REGS_DEFS := 0
    + LIBUNWIND_LIBS = -lunwind -lunwind-x86
    endif
    ifeq ($(ARCH),x86_64)
    ARCH := x86
    @@ -72,6 +73,7 @@ ifeq ($(ARCH),x86_64)
    ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
    endif
    NO_PERF_REGS_DEFS := 0
    + LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
    endif

    # Treat warnings as errors unless directed not to
    @@ -86,7 +88,7 @@ ifndef PERF_DEBUG
    CFLAGS_OPTIMIZE = -O6
    endif

    -CFLAGS = -fno-omit-frame-pointer -ggdb3 -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
    +CFLAGS = -fno-omit-frame-pointer -ggdb3 -funwind-tables -Wall -Wextra -std=gnu99 $(CFLAGS_WERROR) $(CFLAGS_OPTIMIZE) -D_FORTIFY_SOURCE=2 $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)
    EXTLIBS = -lpthread -lrt -lelf -lm
    ALL_CFLAGS = $(CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
    ALL_LDFLAGS = $(LDFLAGS)
    @@ -437,6 +439,21 @@ ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y)
    endif # Dwarf support
    endif # NO_DWARF

    +ifndef NO_LIBUNWIND
    +# for linking with debug library, run like:
    +# make DEBUG=1 LIBUNWIND_DIR=/opt/libunwind/
    +ifdef LIBUNWIND_DIR
    + LIBUNWIND_CFLAGS := -I$(LIBUNWIND_DIR)/include
    + LIBUNWIND_LDFLAGS := -L$(LIBUNWIND_DIR)/lib
    +endif
    +
    +FLAGS_UNWIND=$(LIBUNWIND_CFLAGS) $(ALL_CFLAGS) $(LIBUNWIND_LDFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(LIBUNWIND_LIBS)
    +ifneq ($(call try-cc,$(SOURCE_LIBUNWIND),$(FLAGS_UNWIND)),y)
    + msg := $(warning No libunwind found. Please install libunwind >= 0.99);
    + NO_LIBUNWIND := 1
    +endif # Libunwind support
    +endif # NO_LIBUNWIND
    +
    -include arch/$(ARCH)/Makefile

    ifneq ($(OUTPUT),)
    @@ -468,6 +485,14 @@ else
    endif # PERF_HAVE_DWARF_REGS
    endif # NO_DWARF

    +ifdef NO_LIBUNWIND
    + BASIC_CFLAGS += -DNO_LIBUNWIND_SUPPORT
    +else
    + EXTLIBS += $(LIBUNWIND_LIBS)
    + BASIC_CFLAGS := $(LIBUNWIND_CFLAGS) $(BASIC_CFLAGS)
    + BASIC_LDFLAGS := $(LIBUNWIND_LDFLAGS) $(BASIC_LDFLAGS)
    +endif
    +
    ifdef NO_NEWT
    BASIC_CFLAGS += -DNO_NEWT_SUPPORT
    else
    diff --git a/tools/perf/config/feature-tests.mak b/tools/perf/config/feature-tests.mak
    index d9084e0..51cd201 100644
    --- a/tools/perf/config/feature-tests.mak
    +++ b/tools/perf/config/feature-tests.mak
    @@ -141,3 +141,28 @@ int main(void)
    return 0;
    }
    endef
    +
    +ifndef NO_LIBUNWIND
    +define SOURCE_LIBUNWIND
    +#include <libunwind.h>
    +#include <stdlib.h>
    +
    +extern int UNW_OBJ(dwarf_search_unwind_table) (unw_addr_space_t as,
    + unw_word_t ip,
    + unw_dyn_info_t *di,
    + unw_proc_info_t *pi,
    + int need_unwind_info, void *arg);
    +
    +
    +#define dwarf_search_unwind_table UNW_OBJ(dwarf_search_unwind_table)
    +
    +int main(void)
    +{
    + unw_addr_space_t addr_space;
    + addr_space = unw_create_addr_space(NULL, 0);
    + unw_init_remote(NULL, addr_space, NULL);
    + dwarf_search_unwind_table(addr_space, 0, NULL, NULL, 0, NULL);
    + return 0;
    +}
    +endef
    +endif
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-04-17 13:21    [W:0.029 / U:152.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site