From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756246AbcAIQ1l (ORCPT ); Sat, 9 Jan 2016 11:27:41 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41800 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755877AbcAIQ1h (ORCPT ); Sat, 9 Jan 2016 11:27:37 -0500 Date: Sat, 9 Jan 2016 08:27:12 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, jolsa@kernel.org, namhyung@kernel.org, pi3orama@163.com, mingo@kernel.org, dsahern@gmail.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, acme@redhat.com, lizefan@huawei.com, wangnan0@huawei.com Reply-To: namhyung@kernel.org, pi3orama@163.com, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, dsahern@gmail.com, tglx@linutronix.de, acme@redhat.com, lizefan@huawei.com, a.p.zijlstra@chello.nl, wangnan0@huawei.com In-Reply-To: <1450893514-9158-3-git-send-email-jolsa@kernel.org> References: <1450893514-9158-3-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build feature: Move dwarf post unwind choice output into perf Git-Commit-ID: 76ee2ff342743e57cb6dc059d0aba90e0c4c9bfc X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 76ee2ff342743e57cb6dc059d0aba90e0c4c9bfc Gitweb: http://git.kernel.org/tip/76ee2ff342743e57cb6dc059d0aba90e0c4c9bfc Author: Jiri Olsa AuthorDate: Wed, 23 Dec 2015 18:58:31 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 6 Jan 2016 20:11:13 -0300 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 Tested-by: Wang Nan Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama Link: http://lkml.kernel.org/r/1450893514-9158-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 a8b4bef..2075312 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 a552417..18b2f96 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