Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1242603 > unrolled thread
| Started by | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| First post | 2015-10-08 19:00 +0200 |
| Last post | 2015-10-08 21:40 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] perf: Fix build on architectures without CONFIG_PERF_REGS Ben Hutchings <ben@decadent.org.uk> - 2015-10-08 19:00 +0200
Re: [PATCH] perf: Fix build on architectures without CONFIG_PERF_REGS Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-10-08 20:10 +0200
Re: [PATCH] perf: Fix build on architectures without CONFIG_PERF_REGS Ben Hutchings <ben@decadent.org.uk> - 2015-10-08 21:40 +0200
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2015-10-08 19:00 +0200 |
| Subject | [PATCH] perf: Fix build on architectures without CONFIG_PERF_REGS |
| Message-ID | <qhmHU-UH-13@gated-at.bofh.it> |
[Multipart message — attachments visible in raw view] — view raw
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 <ben@decadent.org.uk>
Cc: Stephane Eranian <eranian@google.com>
---
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[] = {
"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) += intel-pt-decoder/
libperf-$(CONFIG_AUXTRACE) += intel-pt.o
libperf-$(CONFIG_AUXTRACE) += intel-bts.o
libperf-y += parse-branch-options.o
-libperf-y += parse-regs-options.o
+libperf-$(CONFIG_PERF_REGS) += parse-regs-options.o
libperf-$(CONFIG_LIBELF) += symbol-elf.o
libperf-$(CONFIG_LIBELF) += probe-file.o
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[toc] | [next] | [standalone]
| From | Arnaldo Carvalho de Melo <acme@kernel.org> |
|---|---|
| Date | 2015-10-08 20:10 +0200 |
| Message-ID | <qhnNE-2Gn-7@gated-at.bofh.it> |
| In reply to | #1242603 |
Em Thu, Oct 08, 2015 at 05:53:05PM +0100, Ben Hutchings escreveu:
> perf currently fails to link on all architectures other than arm,
> arm64 and x86:
This was fixed recently, merged already, check:
https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=perf/urgent&id=9fb4765451f22c5e782c1590747717550bff34b2
> 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 <ben@decadent.org.uk>
> Cc: Stephane Eranian <eranian@google.com>
> ---
> 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[] = {
> "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) += intel-pt-decoder/
> libperf-$(CONFIG_AUXTRACE) += intel-pt.o
> libperf-$(CONFIG_AUXTRACE) += intel-bts.o
> libperf-y += parse-branch-options.o
> -libperf-y += parse-regs-options.o
> +libperf-$(CONFIG_PERF_REGS) += parse-regs-options.o
>
> libperf-$(CONFIG_LIBELF) += symbol-elf.o
> libperf-$(CONFIG_LIBELF) += probe-file.o
> --
> Ben Hutchings
> Once a job is fouled up, anything done to improve it makes it worse.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Ben Hutchings <ben@decadent.org.uk> |
|---|---|
| Date | 2015-10-08 21:40 +0200 |
| Subject | Re: [PATCH] perf: Fix build on architectures without CONFIG_PERF_REGS |
| Message-ID | <qhpcJ-4zs-11@gated-at.bofh.it> |
| In reply to | #1242661 |
[Multipart message — attachments visible in raw view] — view raw
On Thu, 2015-10-08 at 14:59 -0300, Arnaldo Carvalho de Melo wrote: > Em Thu, Oct 08, 2015 at 05:53:05PM +0100, Ben Hutchings escreveu: > > perf currently fails to link on all architectures other than arm, > > arm64 and x86: > > This was fixed recently, merged already, check: > > https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=pe > rf/urgent&id=9fb4765451f22c5e782c1590747717550bff34b2 [...] Thanks. Ben. -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web