aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-12-23 12:58:31 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-01-06 18:11:13 -0500
commit76ee2ff342743e57cb6dc059d0aba90e0c4c9bfc (patch)
tree22dc7af2a295dd97d92059e9c3b2ccbec7e6eb99
parentd0018b495c0429af3efc1b54f16d291a9fa8b4be (diff)
tools build feature: Move dwarf post unwind choice output into perf
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>
-rw-r--r--tools/build/Makefile.feature9
-rw-r--r--tools/perf/config/Makefile4
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)
126FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat)))) 126FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat))))
127FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME)) 127FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME))
128 128
129ifeq ($(dwarf-post-unwind),1)
130 FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text))
131endif
132
133# The $(feature_display) controls the default detection message 129# The $(feature_display) controls the default detection message
134# output. It's set if: 130# output. It's set if:
135# - detected features differes from stored features from 131# - detected features differes from stored features from
@@ -160,11 +156,6 @@ ifeq ($(feature_display),1)
160 $(info ) 156 $(info )
161 $(info Auto-detecting system features:) 157 $(info Auto-detecting system features:)
162 $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),)) 158 $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),))
163
164 ifeq ($(dwarf-post-unwind),1)
165 $(call feature_print_text,"DWARF post unwind library", $(dwarf-post-unwind-text))
166 endif
167
168 ifneq ($(feature_verbose),1) 159 ifneq ($(feature_verbose),1)
169 $(info ) 160 $(info )
170 endif 161 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)
751 $(call print_var,sysconfdir) 751 $(call print_var,sysconfdir)
752 $(call print_var,LIBUNWIND_DIR) 752 $(call print_var,LIBUNWIND_DIR)
753 $(call print_var,LIBDW_DIR) 753 $(call print_var,LIBDW_DIR)
754
755 ifeq ($(dwarf-post-unwind),1)
756 $(call feature_print_text,"DWARF post unwind library", $(dwarf-post-unwind-text))
757 endif
754 $(info ) 758 $(info )
755endif 759endif
756 760