lkml.org 
[lkml]   [2013]   [Nov]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/29] perf tools: Fix libunwind build and feature detection for 32-bit build
    Date
    From: Adrian Hunter <adrian.hunter@intel.com>

    Use -lunwind-x86 instead of -lunwind-x86_64 for 32-bit build.

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Namhyung Kim <namhyung@gmail.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/r/1383313899-15987-5-git-send-email-adrian.hunter@intel.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/config/Makefile | 6 ++++--
    tools/perf/config/feature-checks/Makefile | 4 ++--
    2 files changed, 6 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index 2f1d7d78f744..ffb5f55c8fba 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -25,9 +25,11 @@ ifeq ($(ARCH),x86_64)
    RAW_ARCH := x86_64
    CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT
    ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
    + LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
    + else
    + LIBUNWIND_LIBS = -lunwind -lunwind-x86
    endif
    NO_PERF_REGS := 0
    - LIBUNWIND_LIBS = -lunwind -lunwind-x86_64
    endif

    ifeq ($(NO_PERF_REGS),0)
    @@ -96,7 +98,7 @@ endif

    feature_check = $(eval $(feature_check_code))
    define feature_check_code
    - feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
    + feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) LIBUNWIND_LIBS="$(LIBUNWIND_LIBS)" -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)
    endef

    feature_set = $(eval $(feature_set_code))
    diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
    index 353c00cde4d6..d37d58d273fe 100644
    --- a/tools/perf/config/feature-checks/Makefile
    +++ b/tools/perf/config/feature-checks/Makefile
    @@ -36,7 +36,7 @@ BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
    ###############################

    test-all:
    - $(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lunwind -lunwind-x86_64 -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl
    + $(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma $(LIBUNWIND_LIBS) -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl

    test-hello:
    $(BUILD)
    @@ -72,7 +72,7 @@ test-libnuma:
    $(BUILD) -lnuma

    test-libunwind:
    - $(BUILD) -lunwind -lunwind-x86_64 -lelf
    + $(BUILD) $(LIBUNWIND_LIBS) -lelf

    test-libaudit:
    $(BUILD) -laudit
    --
    1.8.1.4


    \
     
     \ /
      Last update: 2013-11-04 20:41    [W:4.178 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site