From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932181AbbBRSg4 (ORCPT ); Wed, 18 Feb 2015 13:36:56 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41403 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752622AbbBRSgx (ORCPT ); Wed, 18 Feb 2015 13:36:53 -0500 Date: Wed, 18 Feb 2015 10:35:34 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: fweisbec@gmail.com, tglx@linutronix.de, paulus@samba.org, cjashfor@linux.vnet.ibm.com, bp@alien8.de, hpa@zytor.com, dsahern@gmail.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, eranian@google.com, namhyung@kernel.org, peterz@infradead.org, will.deacon@arm.com, jolsa@kernel.org, alexis.berlemont@gmail.com, sukadev@linux.vnet.ibm.com Reply-To: mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, eranian@google.com, namhyung@kernel.org, sukadev@linux.vnet.ibm.com, alexis.berlemont@gmail.com, will.deacon@arm.com, peterz@infradead.org, jolsa@kernel.org, fweisbec@gmail.com, cjashfor@linux.vnet.ibm.com, tglx@linutronix.de, paulus@samba.org, hpa@zytor.com, bp@alien8.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Add perf regs objects building Git-Commit-ID: 3bc3374cc50ce533259b7efed261f3d68307113c 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: 3bc3374cc50ce533259b7efed261f3d68307113c Gitweb: http://git.kernel.org/tip/3bc3374cc50ce533259b7efed261f3d68307113c Author: Jiri Olsa AuthorDate: Tue, 30 Dec 2014 13:30:04 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Feb 2015 11:50:34 -0300 perf build: Add perf regs objects building Move the regs objects building under build framework to be included in the libperf build object. 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-hgny792g5x5iaklc34aa57uh@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 7 ------- tools/perf/config/Makefile | 4 ++++ tools/perf/util/Build | 2 ++ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 4705fa9..7daccac 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -349,13 +349,6 @@ install-gtk: $(OUTPUT)libperf-gtk.so $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif -ifeq ($(NO_PERF_REGS),0) - ifeq ($(ARCH),x86) - LIB_H += arch/x86/include/perf_regs.h - endif - LIB_OBJS += $(OUTPUT)util/perf_regs.o -endif - ifndef NO_ZLIB LIB_OBJS += $(OUTPUT)util/zlib.o endif diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index e92d1a4..2fc4d56 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -48,6 +48,10 @@ ifeq ($(ARCH),arm64) LIBUNWIND_LIBS = -lunwind -lunwind-aarch64 endif +ifeq ($(NO_PERF_REGS),0) + $(call detected,CONFIG_PERF_REGS) +endif + # So far there's only x86 and arm libdw unwind support merged in perf. # Disable it on all other architectures in case libdw unwind # support is detected in system. Add supported architectures diff --git a/tools/perf/util/Build b/tools/perf/util/Build index b0a6542..f698432 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -90,6 +90,8 @@ libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-y += scripting-engines/ +libperf-$(CONFIG_PERF_REGS) += perf_regs.o + CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"