From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934526AbbJHQxX (ORCPT ); Thu, 8 Oct 2015 12:53:23 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:33715 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933270AbbJHQxW (ORCPT ); Thu, 8 Oct 2015 12:53:22 -0400 Message-ID: <1444323185.2956.260.camel@decadent.org.uk> Subject: [PATCH] perf: Fix build on architectures without CONFIG_PERF_REGS From: Ben Hutchings To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Cc: Stephane Eranian , LKML Date: Thu, 08 Oct 2015 17:53:05 +0100 Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-i9tv1Y1C4iGKnoMIdI1Q" X-Mailer: Evolution 3.16.5-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.247 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-i9tv1Y1C4iGKnoMIdI1Q Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable perf currently fails to link on all architectures other than arm, arm64 and x86: tools/perf/libperf.a(libperf-in.o): In function `parse_regs': tools/perf/util/parse-regs-options.c:28: undefined reference to `sample_reg= _masks' tools/perf/util/parse-regs-options.c:28: undefined reference to `sample_reg= _masks' tools/perf/util/parse-regs-options.c:45: undefined reference to `sample_reg= _masks' tools/perf/util/parse-regs-options.c:38: undefined reference to `sample_reg= _masks' Fixes: bcc84ec65ad1 ("perf record: Add ability to name registers to record"= ) Signed-off-by: Ben Hutchings Cc: Stephane Eranian --- tools/perf/builtin-record.c | 2 ++ tools/perf/util/Build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 142eeb3..34dd749c 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1082,9 +1082,11 @@ struct option __record_options[] =3D { "sample transaction flags (special events only)"), OPT_BOOLEAN(0, "per-thread", &record.opts.target.per_thread, "use per-thread mmaps"), +#ifdef CONFIG_PERF_REGS OPT_CALLBACK_OPTARG('I', "intr-regs", &record.opts.sample_intr_regs, NULL= , "any register", "sample selected machine registers on interrupt," " use -I ? to list register names", parse_regs), +#endif OPT_BOOLEAN(0, "running-time", &record.opts.running_time, "Record running/enabled time of read (:S) events"), OPT_CALLBACK('k', "clockid", &record.opts, diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 349bc96..333b08d 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -83,7 +83,7 @@ libperf-$(CONFIG_AUXTRACE) +=3D intel-pt-decoder/ libperf-$(CONFIG_AUXTRACE) +=3D intel-pt.o libperf-$(CONFIG_AUXTRACE) +=3D intel-bts.o libperf-y +=3D parse-branch-options.o -libperf-y +=3D parse-regs-options.o +libperf-$(CONFIG_PERF_REGS) +=3D parse-regs-options.o =20 libperf-$(CONFIG_LIBELF) +=3D symbol-elf.o libperf-$(CONFIG_LIBELF) +=3D probe-file.o --=20 Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse. --=-i9tv1Y1C4iGKnoMIdI1Q Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAVhafcee/yOyVhhEJAQr4ew//Wu/3bHbZaCGDTkKLDKF94/48Dm87LSuE Vj+yfvFBYQNUqp0RxKnWighKmdB0g8K2DyxBrx4q2Xl4MQnybQ+gARdScUwCd1GE pXdXkpzfFIi8Ui7JwCeKOoOcgDaPCt3JpW7tWeRls1B0GyW8BfsMzkel9T0LBR0x +QdUBRl2A8kbqkxdSBUKsDmrAfvLDfaMDkluVBFRgZdja8GTiobchSoC5jwyOE4h ao2jkUKblmg2MP6H11kBnljrk03X6+CdIDTh7LXKd9M39R3vA5t21C4rJJI7DZjm D/Tw3ZxHTSR9smF5rOQyDJZIZU6D8PbC18TOHCC6E158sjjigTLTWnyId00t6sLk PsmuCinTPObSB8UBcJUl/s6iOrD1yihMm8yr0sjo8a5B/7ehZ2+pgtuZq50z1CvN GOwcxi0+07nJZRv0csUxz5Mequn9Ii80rkqJ2L6I5rrQzA1lOOHwAjQrPK//lfgp x9KyJPO2KGPXM+iXmobyLo0mcDlXa99q6xEqpa93j6fhud8S8kLZV77G/MRqpoJs BFM7ReDbDitHL7Djw7owo0bHyT+bgWvms6DBGYaJb9d5OEyXJVK5Nl6E5h/8gcm+ Ta3h2eNsRHWMLhoJ5ANZQS4gME8I9kfm2idQJIwNcfEwHhGU5j+Yu1z/4/BjS0Cx dR+phUs5L2g= =ow2B -----END PGP SIGNATURE----- --=-i9tv1Y1C4iGKnoMIdI1Q--