From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751534AbdGZR0j (ORCPT ); Wed, 26 Jul 2017 13:26:39 -0400 Received: from terminus.zytor.com ([65.50.211.136]:50515 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751040AbdGZR0h (ORCPT ); Wed, 26 Jul 2017 13:26:37 -0400 Date: Wed, 26 Jul 2017 10:22:19 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: eranian@google.com, tglx@linutronix.de, sudeep.holla@arm.com, hpa@zytor.com, pjt@google.com, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, davidcc@google.com, acme@redhat.com, elena.reshetova@intel.com, alexander.shishkin@linux.intel.com, wangnan0@huawei.com, keescook@chromium.org Reply-To: eranian@google.com, tglx@linutronix.de, hpa@zytor.com, sudeep.holla@arm.com, jolsa@kernel.org, mingo@kernel.org, pjt@google.com, linux-kernel@vger.kernel.org, davidcc@google.com, acme@redhat.com, alexander.shishkin@linux.intel.com, keescook@chromium.org, wangnan0@huawei.com, elena.reshetova@intel.com In-Reply-To: <20170719011839.99399-3-davidcc@google.com> References: <20170719011839.99399-3-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Add EXCLUDE_EXTLIBS and EXTRA_PERFLIBS to makefile Git-Commit-ID: cb281fea4b0a326d2a2104f8ffae2b6895c561fd 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: cb281fea4b0a326d2a2104f8ffae2b6895c561fd Gitweb: http://git.kernel.org/tip/cb281fea4b0a326d2a2104f8ffae2b6895c561fd Author: David Carrillo-Cisneros AuthorDate: Tue, 18 Jul 2017 18:18:37 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 25 Jul 2017 11:23:51 -0300 perf tools: Add EXCLUDE_EXTLIBS and EXTRA_PERFLIBS to makefile The goal is to allow users to override linking of libraries that were automatically added to PERFLIBS. EXCLUDE_EXTLIBS contains linker flags to be removed from LIBS while EXTRA_PERFLIBS contains linker flags to be added. My use case is to force certain library to be build statically, e.g. for libelf: EXCLUDE_EXTLIBS=-lelf EXTRA_PERFLIBS=path/libelf.a Signed-off-by: David Carrillo-Cisneros Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Elena Reshetova Cc: Kees Kook Cc: Paul Turner Cc: Stephane Eranian Cc: Sudeep Holla Cc: Wang Nan Link: http://lkml.kernel.org/r/20170719011839.99399-3-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5008f51..100a6c1 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -33,6 +33,11 @@ include ../scripts/utilities.mak # # Define EXTRA_CFLAGS=-m64 or EXTRA_CFLAGS=-m32 as appropriate for cross-builds. # +# Define EXCLUDE_EXTLIBS=-lmylib to exclude libmylib from the auto-generated +# EXTLIBS. +# +# Define EXTRA_PERFLIBS to pass extra libraries to PERFLIBS. +# # Define NO_DWARF if you do not want debug-info analysis feature at all. # # Define WERROR=0 to disable treating any warnings as errors. @@ -352,7 +357,8 @@ ifdef ASCIIDOC8 export ASCIIDOC8 endif -LIBS = -Wl,--whole-archive $(PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group +EXTLIBS := $(call filter-out,$(EXCLUDE_EXTLIBS),$(EXTLIBS)) +LIBS = -Wl,--whole-archive $(PERFLIBS) $(EXTRA_PERFLIBS) -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group ifeq ($(USE_CLANG), 1) CLANGLIBS_LIST = AST Basic CodeGen Driver Frontend Lex Tooling Edit Sema Analysis Parse Serialization