From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755552AbbBRSh1 (ORCPT ); Wed, 18 Feb 2015 13:37:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41443 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753261AbbBRShY (ORCPT ); Wed, 18 Feb 2015 13:37:24 -0500 Date: Wed, 18 Feb 2015 10:36:30 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: mingo@kernel.org, will.deacon@arm.com, cjashfor@linux.vnet.ibm.com, hpa@zytor.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, bp@alien8.de, acme@redhat.com, tglx@linutronix.de, eranian@google.com, jolsa@kernel.org, dsahern@gmail.com, peterz@infradead.org, alexis.berlemont@gmail.com, sukadev@linux.vnet.ibm.com, namhyung@kernel.org, paulus@samba.org Reply-To: acme@redhat.com, tglx@linutronix.de, jolsa@kernel.org, eranian@google.com, peterz@infradead.org, dsahern@gmail.com, sukadev@linux.vnet.ibm.com, alexis.berlemont@gmail.com, paulus@samba.org, namhyung@kernel.org, mingo@kernel.org, will.deacon@arm.com, cjashfor@linux.vnet.ibm.com, hpa@zytor.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, bp@alien8.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Add arch x86 objects building Git-Commit-ID: 5e8c0fb6a95728b852d56c0a9244425d474670c0 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: 5e8c0fb6a95728b852d56c0a9244425d474670c0 Gitweb: http://git.kernel.org/tip/5e8c0fb6a95728b852d56c0a9244425d474670c0 Author: Jiri Olsa AuthorDate: Tue, 30 Dec 2014 14:03:40 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Feb 2015 13:12:01 -0300 perf build: Add arch x86 objects building Move the x86 arch objects building under build framework to be included in the libperf build object. Adding also arch/$(ARCH)/Build files for the rest of the archs. The reason for this is that in arch/Build we now do: +libperf-y += $(ARCH)/ which would make the build to fail on other architectures, because the build framework requires 'Build' file in nested directories and this patch adds it only for x86. Signed-off-by: Jiri Olsa Tested-by: Sukadev Bhattiprolu Tested-by: Will Deacon Cc: Alexis Berlemont Cc: Borislav Petkov Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-5enob06z07m7ew6nzzdmp3n2@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/Build | 1 + tools/{build/tests/ex/empty => perf/arch/arm}/Build | 0 tools/{build/tests/ex/empty => perf/arch/arm64}/Build | 0 tools/{build/tests/ex/empty => perf/arch/powerpc}/Build | 0 tools/{build/tests/ex/empty => perf/arch/s390}/Build | 0 tools/{build/tests/ex/empty => perf/arch/sh}/Build | 0 tools/{build/tests/ex/empty => perf/arch/sparc}/Build | 0 tools/perf/arch/x86/Build | 2 ++ tools/perf/arch/x86/Makefile | 15 --------------- tools/perf/arch/x86/tests/Build | 2 ++ tools/perf/arch/x86/util/Build | 8 ++++++++ 11 files changed, 13 insertions(+), 15 deletions(-) diff --git a/tools/perf/arch/Build b/tools/perf/arch/Build index 304f5e7..109eb75 100644 --- a/tools/perf/arch/Build +++ b/tools/perf/arch/Build @@ -1 +1,2 @@ libperf-y += common.o +libperf-y += $(ARCH)/ diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/arm/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/arm/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/arm64/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/arm64/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/powerpc/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/powerpc/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/s390/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/s390/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/sh/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/sh/Build diff --git a/tools/build/tests/ex/empty/Build b/tools/perf/arch/sparc/Build similarity index 100% copy from tools/build/tests/ex/empty/Build copy to tools/perf/arch/sparc/Build diff --git a/tools/perf/arch/x86/Build b/tools/perf/arch/x86/Build new file mode 100644 index 0000000..41bf61d --- /dev/null +++ b/tools/perf/arch/x86/Build @@ -0,0 +1,2 @@ +libperf-y += util/ +libperf-$(CONFIG_DWARF_UNWIND) += tests/ diff --git a/tools/perf/arch/x86/Makefile b/tools/perf/arch/x86/Makefile index 9b21881..21322e0 100644 --- a/tools/perf/arch/x86/Makefile +++ b/tools/perf/arch/x86/Makefile @@ -1,19 +1,4 @@ ifndef NO_DWARF PERF_HAVE_DWARF_REGS := 1 -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o endif -ifndef NO_LIBUNWIND -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o -endif -ifndef NO_LIBDW_DWARF_UNWIND -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libdw.o -endif -ifndef NO_DWARF_UNWIND -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/regs_load.o -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o -endif -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/tsc.o -LIB_H += arch/$(ARCH)/util/tsc.h HAVE_KVM_STAT_SUPPORT := 1 -LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/kvm-stat.o diff --git a/tools/perf/arch/x86/tests/Build b/tools/perf/arch/x86/tests/Build new file mode 100644 index 0000000..b30eff9 --- /dev/null +++ b/tools/perf/arch/x86/tests/Build @@ -0,0 +1,2 @@ +libperf-y += regs_load.o +libperf-y += dwarf-unwind.o diff --git a/tools/perf/arch/x86/util/Build b/tools/perf/arch/x86/util/Build new file mode 100644 index 0000000..cfbccc4 --- /dev/null +++ b/tools/perf/arch/x86/util/Build @@ -0,0 +1,8 @@ +libperf-y += header.o +libperf-y += tsc.o +libperf-y += kvm-stat.o + +libperf-$(CONFIG_DWARF) += dwarf-regs.o + +libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o +libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o