From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752625AbbH1Glw (ORCPT ); Fri, 28 Aug 2015 02:41:52 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54777 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbbH1Glu (ORCPT ); Fri, 28 Aug 2015 02:41:50 -0400 Date: Thu, 27 Aug 2015 23:41:37 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, acme@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, jolsa@redhat.com, sukadev@linux.vnet.ibm.com Reply-To: linux-kernel@vger.kernel.org, adrian.hunter@intel.com, hpa@zytor.com, acme@kernel.org, jolsa@kernel.org, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, sukadev@linux.vnet.ibm.com, jolsa@redhat.com In-Reply-To: <20150826130103.GF22670@krava.redhat.com> References: <20150826130103.GF22670@krava.redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Allow duplicate objects in the object list Git-Commit-ID: 0bdede8a3e4ff7710622a2e6713d04b3243c24a8 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: 0bdede8a3e4ff7710622a2e6713d04b3243c24a8 Gitweb: http://git.kernel.org/tip/0bdede8a3e4ff7710622a2e6713d04b3243c24a8 Author: Jiri Olsa AuthorDate: Wed, 26 Aug 2015 15:01:03 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 26 Aug 2015 10:34:58 -0300 tools build: Allow duplicate objects in the object list It's sometimes useful to specify the object affiliation to multiple config options like: libperf-$(CONFIG_X86) += tsc.o libperf-$(CONFIG_AUXTRACE) += tsc.o while the object itself is linked only once. Adding the support for this and ignoring duplicate objects in the object list. Suggested-by: Arnaldo Carvalho de Melo Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: Sukadev Bhattiprolu Link: http://lkml.kernel.org/r/20150826130103.GF22670@krava.redhat.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Documentation/Build.txt | 1 + tools/build/Makefile.build | 2 +- tools/build/tests/ex/Build | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/build/Documentation/Build.txt b/tools/build/Documentation/Build.txt index 00ad2d6..aa5e092 100644 --- a/tools/build/Documentation/Build.txt +++ b/tools/build/Documentation/Build.txt @@ -66,6 +66,7 @@ To follow the above example, the user provides following 'Build' files: ex/Build: ex-y += a.o ex-y += b.o + ex-y += b.o # duplicates in the lists are allowed libex-y += c.o libex-y += d.o diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build index 8120af9..0c5f485 100644 --- a/tools/build/Makefile.build +++ b/tools/build/Makefile.build @@ -63,7 +63,7 @@ quiet_cmd_gen = GEN $@ # If there's nothing to link, create empty $@ object. quiet_cmd_ld_multi = LD $@ cmd_ld_multi = $(if $(strip $(obj-y)),\ - $(LD) -r -o $@ $(obj-y),rm -f $@; $(AR) rcs $@) + $(LD) -r -o $@ $(filter $(obj-y),$^),rm -f $@; $(AR) rcs $@) # Build rules $(OUTPUT)%.o: %.c FORCE diff --git a/tools/build/tests/ex/Build b/tools/build/tests/ex/Build index 70d8762..429c7d4 100644 --- a/tools/build/tests/ex/Build +++ b/tools/build/tests/ex/Build @@ -1,6 +1,7 @@ ex-y += ex.o ex-y += a.o ex-y += b.o +ex-y += b.o ex-y += empty/ ex-y += empty2/