perf: Fix build on architectures without CONFIG_PERF_REGS
PATCH 1/1 perf: Fix build on architectures without CONFIG_PERF_REGS
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'
--- tools/perf/builtin-record.c | 2 ++ tools/perf/util/Build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
tools/perf/builtin-record.c +2 -0
@@ -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_REGSOPT_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), +#endifOPT_BOOLEAN (0 ,"running-time" , &record.opts.running_time,"Record running/enabled time of read (:S) events" ), OPT_CALLBACK('k', "clockid", &record.opts,
tools/perf/util/Build +1 -1
@@ -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
Signature · 2 lines
Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Arnaldo Carvalho de Melo
maintainerEm Thu, Oct 08, 2015 at 05:53:05PM +0100, Ben Hutchings escreveu:
Quoted 2 lines
perf currently fails to link on all architectures other than arm, arm64 and x86:
This was fixed recently, merged already, check:
Quoted 46 lines
tools/perf/libperf.a(libperf-in.o): In function `parse_regs':
tools/perf/util/parse-regs-options.c:28: undefined reference tosample_reg_masks' tools/perf/util/parse-regs-options.c:28: undefined reference tosample_reg_masks'tools/perf/util/parse-regs-options.c:45: undefined reference tosample_reg_masks' tools/perf/util/parse-regs-options.c:38: undefined reference tosample_reg_masks'Fixes bcc84ec65ad1 ("perf record: Add ability to name registers to record")Signed-off-by Ben Hutchings <[email protected]>Cc Stephane Eranian <[email protected]>--- tools/perf/builtin-record.c | 2 ++ tools/perf/util/Build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)tools/perf/builtin-record.c +2
-0@@ -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_REGSOPT_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), +#endifOPT_BOOLEAN (0 ,"running-time" , &record.opts.running_time,"Record running/enabled time of read (:S) events" ), OPT_CALLBACK('k', "clockid", &record.opts,tools/perf/util/Build +1
-1@@ -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.oSignature · 2 lines
Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Quoted 8 lines · Arnaldo Carvalho de Melo
Em Thu, Oct 08, 2015 at 05:53:05PM +0100, Ben Hutchings escreveu:
Quoted 2 lines
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.
Signature · 2 lines
Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.