perf build currently fails on powerpc: LINK perf libperf.a(libperf-in.o):(.toc+0x120): undefined reference to `sample_reg_masks' libperf.a(libperf-in.o):(.toc+0x130): undefined reference to `sample_reg_masks' collect2: error: ld returned 1 exit status make[1]: *** [perf] Error 1 make: *** [all] Error 2
This is due to parse-regs-options.c using sample_reg_masks, which is defined only with CONFIG_PERF_REGS. In addition, perf record -I is only useful if the arch supports PERF_REGS. Hence, let's expose -I conditionally. Signed-off-by: Naveen N. Rao <[email protected]> --- 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 a01c8ae..de2aaac 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1095,9 +1095,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 HAVE_PERF_REGS_SUPPORT 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 4bc7a9a..cc3960c 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -84,7 +84,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 -- 2.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
