From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755444AbbBRSfU (ORCPT ); Wed, 18 Feb 2015 13:35:20 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41301 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752913AbbBRSfS (ORCPT ); Wed, 18 Feb 2015 13:35:18 -0500 Date: Wed, 18 Feb 2015 10:34:06 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, fweisbec@gmail.com, alexis.berlemont@gmail.com, jolsa@kernel.org, bp@alien8.de, paulus@samba.org, sukadev@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, cjashfor@linux.vnet.ibm.com, hpa@zytor.com, eranian@google.com, acme@redhat.com, peterz@infradead.org, will.deacon@arm.com, dsahern@gmail.com Reply-To: jolsa@kernel.org, bp@alien8.de, paulus@samba.org, sukadev@linux.vnet.ibm.com, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, fweisbec@gmail.com, alexis.berlemont@gmail.com, hpa@zytor.com, acme@redhat.com, eranian@google.com, peterz@infradead.org, will.deacon@arm.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, cjashfor@linux.vnet.ibm.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Add dwarf unwind objects building Git-Commit-ID: b2e45c322e0298652fc05e65c671b2b88d30ae31 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: b2e45c322e0298652fc05e65c671b2b88d30ae31 Gitweb: http://git.kernel.org/tip/b2e45c322e0298652fc05e65c671b2b88d30ae31 Author: Jiri Olsa AuthorDate: Tue, 30 Dec 2014 00:11:11 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Feb 2015 11:46:38 -0300 perf build: Add dwarf unwind objects building Move the dwarf unwind 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-7f7dmhkhs0e7jnqiu9ibzqia@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 9 --------- tools/perf/config/Makefile | 2 ++ tools/perf/util/Build | 3 +++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 5cb62b0..96e3cdc 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -346,15 +346,6 @@ ifneq ($(OUTPUT),) CFLAGS += -I$(OUTPUT) endif -ifndef NO_LIBDW_DWARF_UNWIND - LIB_OBJS += $(OUTPUT)util/unwind-libdw.o - LIB_H += util/unwind-libdw.h -endif - -ifndef NO_LIBUNWIND - LIB_OBJS += $(OUTPUT)util/unwind-libunwind.o -endif - ifndef NO_SLANG LIB_OBJS += $(OUTPUT)ui/browser.o LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 5f55398..e55d811 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -420,9 +420,11 @@ ifdef NO_LIBUNWIND dwarf-post-unwind := 0 else dwarf-post-unwind-text := libdw + $(call detected,CONFIG_LIBDW_DWARF_UNWIND) endif else dwarf-post-unwind-text := libunwind + $(call detected,CONFIG_LIBUNWIND) # Enable libunwind support by default. ifndef NO_LIBDW_DWARF_UNWIND NO_LIBDW_DWARF_UNWIND := 1 diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 10630fb..0401a80 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -85,6 +85,9 @@ endif libperf-$(CONFIG_DWARF) += probe-finder.o libperf-$(CONFIG_DWARF) += dwarf-aux.o +libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o +libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.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))"