From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933073AbdDQIlP (ORCPT ); Mon, 17 Apr 2017 04:41:15 -0400 Received: from terminus.zytor.com ([65.50.211.136]:60961 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932428AbdDQIlM (ORCPT ); Mon, 17 Apr 2017 04:41:12 -0400 Date: Mon, 17 Apr 2017 01:35:24 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, hekuang@huawei.com, tglx@linutronix.de, eranian@google.com, ak@linux.intel.com, mhiramat@kernel.org, jolsa@kernel.org, davidcc@google.com, kim.phillips@arm.com, alexander.shishkin@linux.intel.com, pjt@google.com, sque@chromium.org, peterz@infradead.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, acme@redhat.com Reply-To: tglx@linutronix.de, hekuang@huawei.com, hpa@zytor.com, mingo@kernel.org, davidcc@google.com, mhiramat@kernel.org, ak@linux.intel.com, eranian@google.com, jolsa@kernel.org, sque@chromium.org, pjt@google.com, kim.phillips@arm.com, alexander.shishkin@linux.intel.com, acme@redhat.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, peterz@infradead.org In-Reply-To: <20170412170745.26620-1-davidcc@google.com> References: <20170412170745.26620-1-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Disable JVMTI if no ELF support available Git-Commit-ID: e5e992a7c184c2121adf37bdf292a516af81dbbb 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: e5e992a7c184c2121adf37bdf292a516af81dbbb Gitweb: http://git.kernel.org/tip/e5e992a7c184c2121adf37bdf292a516af81dbbb Author: David Carrillo-Cisneros AuthorDate: Wed, 12 Apr 2017 10:07:45 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 13 Apr 2017 11:47:43 -0300 perf tools: Disable JVMTI if no ELF support available The build of JVMTI depends on LIBELF (-lelf). Make Makefile.conf check this dependendancy and notify user when not present. v2: Comma nitpicking. Signed-off-by: David Carrillo-Cisneros Tested-by: Kim Phillips Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170412170745.26620-1-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index cfd6015..8354d04 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -274,6 +274,7 @@ ifdef NO_LIBELF NO_LIBUNWIND := 1 NO_LIBDW_DWARF_UNWIND := 1 NO_LIBBPF := 1 + NO_JVMTI := 1 else ifeq ($(feature-libelf), 0) ifeq ($(feature-glibc), 1) @@ -283,7 +284,7 @@ else LIBC_SUPPORT := 1 endif ifeq ($(LIBC_SUPPORT),1) - msg := $(warning No libelf found, disables 'probe' tool and BPF support in 'perf record', please install libelf-dev, libelf-devel or elfutils-libelf-devel); + msg := $(warning No libelf found. Disables 'probe' tool, jvmti and BPF support in 'perf record'. Please install libelf-dev, libelf-devel or elfutils-libelf-devel); NO_LIBELF := 1 NO_DWARF := 1 @@ -291,6 +292,7 @@ else NO_LIBUNWIND := 1 NO_LIBDW_DWARF_UNWIND := 1 NO_LIBBPF := 1 + NO_JVMTI := 1 else ifneq ($(filter s% -static%,$(LDFLAGS),),) msg := $(error No static glibc found, please install glibc-static);