From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751637AbdGZR1y (ORCPT ); Wed, 26 Jul 2017 13:27:54 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58037 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751576AbdGZR1w (ORCPT ); Wed, 26 Jul 2017 13:27:52 -0400 Date: Wed, 26 Jul 2017 10:23:02 -0700 From: tip-bot for Sudeep Holla Message-ID: Cc: jolsa@kernel.org, keescook@chromium.org, mingo@kernel.org, peterz@infradead.org, Sudeep.Holla@arm.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, elena.reshetova@intel.com, acme@redhat.com, wangnan0@huawei.com, davidcc@google.com, eranian@google.com, pjt@google.com, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, hpa@zytor.com Reply-To: hpa@zytor.com, acme@redhat.com, wangnan0@huawei.com, eranian@google.com, davidcc@google.com, pjt@google.com, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, peterz@infradead.org, mingo@kernel.org, Sudeep.Holla@arm.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, elena.reshetova@intel.com, jolsa@kernel.org, keescook@chromium.org In-Reply-To: <20170719011839.99399-5-davidcc@google.com> References: <20170719011839.99399-5-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf jvmti: Fix linker error when libelf config is disabled Git-Commit-ID: 5d90faf45427dd76fadbe7a4dc4fce3b6f87b550 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: 5d90faf45427dd76fadbe7a4dc4fce3b6f87b550 Gitweb: http://git.kernel.org/tip/5d90faf45427dd76fadbe7a4dc4fce3b6f87b550 Author: Sudeep Holla AuthorDate: Tue, 18 Jul 2017 18:18:39 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 25 Jul 2017 11:23:53 -0300 perf jvmti: Fix linker error when libelf config is disabled When libelf is disabled in the configuration, we get the following linker error: LINK libperf-jvmti.so ld: cannot find -lelf Makefile.perf:515: recipe for target 'libperf-jvmti.so' failed Jiri pointed out that both librt and libelf are not really required. So this patch fixes the linker error by getting rid of unwanted libraries in the linker stage. Signed-off-by: Sudeep Holla Acked-by: David Carrillo-Cisneros Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Elena Reshetova Cc: Kees Kook Cc: Paul Turner Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Sudeep Holla Cc: Wang Nan Fixes: 209045adc2bb ("perf tools: add JVMTI agent library") Link: http://lkml.kernel.org/r/20170719011839.99399-5-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 100a6c1..d66f90e 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -518,7 +518,7 @@ $(LIBJVMTI_IN): FORCE $(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=jvmti obj=jvmti $(OUTPUT)$(LIBJVMTI): $(LIBJVMTI_IN) - $(QUIET_LINK)$(CC) -shared -Wl,-soname -Wl,$(LIBJVMTI) -o $@ $< -lelf -lrt + $(QUIET_LINK)$(CC) -shared -Wl,-soname -Wl,$(LIBJVMTI) -o $@ $< endif $(patsubst perf-%,%.o,$(PROGRAMS)): $(wildcard */*.h)