From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423216AbcFHIsO (ORCPT ); Wed, 8 Jun 2016 04:48:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54364 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161478AbcFHIsL (ORCPT ); Wed, 8 Jun 2016 04:48:11 -0400 Date: Wed, 8 Jun 2016 01:47:29 -0700 From: tip-bot for He Kuang Message-ID: Cc: jolsa@kernel.org, tglx@linutronix.de, peterz@infradead.org, sukadev@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, eranian@google.com, wangnan0@huawei.com, alexander.shishkin@linux.intel.com, mhiramat@kernel.org, jpoimboe@redhat.com, adrian.hunter@intel.com, ak@linux.intel.com, penberg@kernel.org, kan.liang@intel.com, tumanova@linux.vnet.ibm.com, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, hekuang@huawei.com, dsahern@gmail.com Reply-To: jolsa@kernel.org, tglx@linutronix.de, wangnan0@huawei.com, alexander.shishkin@linux.intel.com, mhiramat@kernel.org, peterz@infradead.org, sukadev@linux.vnet.ibm.com, eranian@google.com, linux-kernel@vger.kernel.org, ak@linux.intel.com, adrian.hunter@intel.com, jpoimboe@redhat.com, mingo@kernel.org, namhyung@kernel.org, hekuang@huawei.com, dsahern@gmail.com, penberg@kernel.org, kan.liang@intel.com, tumanova@linux.vnet.ibm.com, acme@redhat.com, hpa@zytor.com In-Reply-To: <1464924803-22214-6-git-send-email-hekuang@huawei.com> References: <1464924803-22214-6-git-send-email-hekuang@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf unwind: Don't mix LIBUNWIND_LIBS into LIBUNWIND_LDFLAGS Git-Commit-ID: 403cacb8a25eb86d564750fce2293978814d2d15 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: 403cacb8a25eb86d564750fce2293978814d2d15 Gitweb: http://git.kernel.org/tip/403cacb8a25eb86d564750fce2293978814d2d15 Author: He Kuang AuthorDate: Fri, 3 Jun 2016 03:33:14 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 7 Jun 2016 12:08:52 -0300 perf unwind: Don't mix LIBUNWIND_LIBS into LIBUNWIND_LDFLAGS LIBUNWIND_LIBS contains libunwind libraries used for local only, don't mix this into LIBUNWIND_LDFLAGS so we can later use LIBUNWIND_LDFLAGS both for local and remote libunwind. Signed-off-by: He Kuang Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Andi Kleen Cc: David Ahern Cc: Ekaterina Tumanova Cc: Josh Poimboeuf Cc: Kan Liang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Pekka Enberg Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Sukadev Bhattiprolu Cc: Wang Nan Link: http://lkml.kernel.org/r/1464924803-22214-6-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/config/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 6f9f566..118df2d 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -80,13 +80,12 @@ ifdef LIBUNWIND_DIR LIBUNWIND_ARCHS = x86 x86_64 arm aarch64 debug-frame-arm debug-frame-aarch64 $(foreach libunwind_arch,$(LIBUNWIND_ARCHS),$(call libunwind_arch_set_flags,$(libunwind_arch))) endif -LIBUNWIND_LDFLAGS += $(LIBUNWIND_LIBS) # Set per-feature check compilation flags FEATURE_CHECK_CFLAGS-libunwind = $(LIBUNWIND_CFLAGS) -FEATURE_CHECK_LDFLAGS-libunwind = $(LIBUNWIND_LDFLAGS) +FEATURE_CHECK_LDFLAGS-libunwind = $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIBS) FEATURE_CHECK_CFLAGS-libunwind-debug-frame = $(LIBUNWIND_CFLAGS) -FEATURE_CHECK_LDFLAGS-libunwind-debug-frame = $(LIBUNWIND_LDFLAGS) +FEATURE_CHECK_LDFLAGS-libunwind-debug-frame = $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIBS) ifeq ($(NO_PERF_REGS),0) CFLAGS += -DHAVE_PERF_REGS_SUPPORT @@ -409,7 +408,7 @@ ifndef NO_LIBUNWIND CFLAGS += -DHAVE_LIBUNWIND_SUPPORT EXTLIBS += $(LIBUNWIND_LIBS) CFLAGS += $(LIBUNWIND_CFLAGS) - LDFLAGS += $(LIBUNWIND_LDFLAGS) + LDFLAGS += $(LIBUNWIND_LDFLAGS) $(LIBUNWIND_LIBS) endif ifndef NO_LIBAUDIT