From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e39.co.us.ibm.com (e39.co.us.ibm.com [32.97.110.160]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 33DBD1A05FD for ; Wed, 30 Sep 2015 06:04:51 +1000 (AEST) Received: from localhost by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 29 Sep 2015 14:04:50 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (b03cxnp08025.gho.boulder.ibm.com [9.17.130.17]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id BBD0519D806E for ; Tue, 29 Sep 2015 13:55:39 -0600 (MDT) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t8TK3PaG38600946 for ; Tue, 29 Sep 2015 13:03:33 -0700 Received: from d03av01.boulder.ibm.com (localhost [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t8TK4EFP003657 for ; Tue, 29 Sep 2015 14:04:14 -0600 Date: Tue, 29 Sep 2015 11:10:02 -0700 From: Sukadev Bhattiprolu To: Jiri Olsa Cc: "Naveen N. Rao" , LKML , Arnaldo Carvalho de Melo , "mingo@redhat.com" , Stephane Eranian , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH] perf record: Limit --intr-regs to platforms supporting PERF_REGS Message-ID: <20150929181002.GA6822@us.ibm.com> References: <1443096718-11926-1-git-send-email-naveen.n.rao@linux.vnet.ibm.com> <20150924125703.GA11857@krava.redhat.com> <20150924164554.GA11493@naverao1-tp.in.ibm.com> <20150929053617.GA1060@naverao1-tp.in.ibm.com> <20150929065335.GE18363@krava.redhat.com> <20150929080010.GB1060@naverao1-tp.in.ibm.com> <20150929104711.GE27383@krava.redhat.com> <20150929163136.GA24723@naverao1-tp.ibm.com> <20150929171556.GA1856@krava.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20150929171556.GA1856@krava.redhat.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Jiri Olsa [jolsa@redhat.com] wrote: | > I just tried it, but it fails. As Suka points out in his patch: | > "Adding perf_regs.o to util/Build unconditionally, exposes a | > redefinition error for 'perf_reg_value()' function (due to the static | > inline version in util/perf_regs.h). So use #ifdef | > HAVE_PERF_REGS_SUPPORT' around that function." | | could you (or Suka) please reply in here with the patch? Jiri, Do you mean this patch? I was planning on pinging Arnaldo again in a couple of days about this patch, since the powerpc build is broken. Sukadev --- >>From d1171a4c34c6100ec8b663ddb803dd69ef3fb7ce Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu Date: Thu, 24 Sep 2015 17:53:49 -0400 Subject: [PATCH] perf: Fix build break on powerpc due to sample_reg_masks perf_regs.c does not get built on Powerpc as CONFIG_PERF_REGS is false. So the weak definition for 'sample_regs_masks' doesn't get picked up. Adding perf_regs.o to util/Build unconditionally, exposes a redefinition error for 'perf_reg_value()' function (due to the static inline version in util/perf_regs.h). So use #ifdef HAVE_PERF_REGS_SUPPORT' around that function. Signed-off-by: Sukadev Bhattiprolu --- tools/perf/util/Build | 2 +- tools/perf/util/perf_regs.c | 2 ++ tools/perf/util/perf_regs.h | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 349bc96..e5f18a2 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -17,6 +17,7 @@ libperf-y += levenshtein.o libperf-y += llvm-utils.o libperf-y += parse-options.o libperf-y += parse-events.o +libperf-y += perf_regs.o libperf-y += path.o libperf-y += rbtree.o libperf-y += bitmap.o @@ -103,7 +104,6 @@ libperf-$(CONFIG_LIBBABELTRACE) += data-convert-bt.o libperf-y += scripting-engines/ -libperf-$(CONFIG_PERF_REGS) += perf_regs.o libperf-$(CONFIG_ZLIB) += zlib.o libperf-$(CONFIG_LZMA) += lzma.o diff --git a/tools/perf/util/perf_regs.c b/tools/perf/util/perf_regs.c index 885e8ac..6b8eb13 100644 --- a/tools/perf/util/perf_regs.c +++ b/tools/perf/util/perf_regs.c @@ -6,6 +6,7 @@ const struct sample_reg __weak sample_reg_masks[] = { SMPL_REG_END }; +#ifdef HAVE_PERF_REGS_SUPPORT int perf_reg_value(u64 *valp, struct regs_dump *regs, int id) { int i, idx = 0; @@ -29,3 +30,4 @@ out: *valp = regs->cache_regs[id]; return 0; } +#endif diff --git a/tools/perf/util/perf_regs.h b/tools/perf/util/perf_regs.h index 2984dcc..8dbdfeb 100644 --- a/tools/perf/util/perf_regs.h +++ b/tools/perf/util/perf_regs.h @@ -3,6 +3,10 @@ #include +#ifndef __maybe_unused +#define __maybe_unused __attribute__((unused)) +#endif + struct regs_dump; struct sample_reg { -- 1.8.3.1 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev