lkml.org 
[lkml]   [2016]   [Jan]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/59] tools build feature: Move dwarf post unwind choice output into perf
    Date
    From: Jiri Olsa <jolsa@kernel.org>

    We decide what dwarf unwind to choose way after the Makefile.feature
    makefile is included. The $(dwarf-post-unwind) is not even set at that
    time. For the same reason it was never included in FEATURE-DUMP file.

    Moving it into perf VF=1 verbose display.

    $ make VF=1
    BUILD: Doing 'make -j4' parallel build
    Auto-detecting system features:
    ... dwarf: [ on ]
    ...
    ... LIBUNWIND_DIR:
    ... LIBDW_DIR:
    ... DWARF post unwind library: libunwind
    ...

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Tested-by: Wang Nan <wangnan0@huawei.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Zefan Li <lizefan@huawei.com>
    Cc: pi3orama <pi3orama@163.com>
    Link: http://lkml.kernel.org/r/1450893514-9158-3-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/build/Makefile.feature | 9 ---------
    tools/perf/config/Makefile | 4 ++++
    2 files changed, 4 insertions(+), 9 deletions(-)

    diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature
    index a8b4befdef7e..20753124c8f4 100644
    --- a/tools/build/Makefile.feature
    +++ b/tools/build/Makefile.feature
    @@ -126,10 +126,6 @@ FEATURE_DUMP_FILENAME = $(OUTPUT)FEATURE-DUMP$(FEATURE_USER)
    FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat))))
    FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME))

    -ifeq ($(dwarf-post-unwind),1)
    - FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text))
    -endif
    -
    # The $(feature_display) controls the default detection message
    # output. It's set if:
    # - detected features differes from stored features from
    @@ -160,11 +156,6 @@ ifeq ($(feature_display),1)
    $(info )
    $(info Auto-detecting system features:)
    $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),))
    -
    - ifeq ($(dwarf-post-unwind),1)
    - $(call feature_print_text,"DWARF post unwind library", $(dwarf-post-unwind-text))
    - endif
    -
    ifneq ($(feature_verbose),1)
    $(info )
    endif
    diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
    index a5524179d26e..18b2f96d0941 100644
    --- a/tools/perf/config/Makefile
    +++ b/tools/perf/config/Makefile
    @@ -751,6 +751,10 @@ ifeq ($(VF),1)
    $(call print_var,sysconfdir)
    $(call print_var,LIBUNWIND_DIR)
    $(call print_var,LIBDW_DIR)
    +
    + ifeq ($(dwarf-post-unwind),1)
    + $(call feature_print_text,"DWARF post unwind library", $(dwarf-post-unwind-text))
    + endif
    $(info )
    endif

    --
    2.1.0
    \
     
     \ /
      Last update: 2016-01-08 20:01    [W:2.614 / U:1.180 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site