[tip:perf/core] perf probe: Don't compile CFI related code if elfutils is old
in [Kernel]
|
Prev: [PATCH] numa x86_64 use generic percpu var numa_node_id implementation fix3 [was Re: mmotm 2010-05-14-13-33 uploaded]
Next: [RFC PATCH v2 1/2] dm: allow a dm-fs-style device to be shared via dm-ioctl
From: tip-bot for Masami Hiramatsu on 17 May 2010 22:00 Commit-ID: 7752f1b096e13991f20b59fd11ba73da3809d93c Gitweb: http://git.kernel.org/tip/7752f1b096e13991f20b59fd11ba73da3809d93c Author: Masami Hiramatsu <mhiramat(a)redhat.com> AuthorDate: Mon, 10 May 2010 13:12:07 -0400 Committer: Arnaldo Carvalho de Melo <acme(a)redhat.com> CommitDate: Mon, 17 May 2010 22:13:51 -0300 perf probe: Don't compile CFI related code if elfutils is old Check elfutils version, and if it is old don't compile CFI analysis code. This allows to compile perf with old elfutils. Signed-off-by: Masami Hiramatsu <mhiramat(a)redhat.com> Tested-by: Stephane Eranian <eranian(a)google.com> Reported-by: Robert Richter <robert.richter(a)amd.com> Cc: Ingo Molnar <mingo(a)elte.hu> LKML-Reference: <20100510171207.26029.97604.stgit(a)localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com> --- tools/perf/util/probe-finder.c | 4 ++++ tools/perf/util/probe-finder.h | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 562b144..93583eb 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -668,6 +668,7 @@ static int convert_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) ret = dwarf_getlocation_addr(&fb_attr, pf->addr, &pf->fb_ops, &nops, 1); if (ret <= 0 || nops == 0) { pf->fb_ops = NULL; +#if _ELFUTILS_PREREQ(0, 142) } else if (nops == 1 && pf->fb_ops[0].atom == DW_OP_call_frame_cfa && pf->cfi != NULL) { Dwarf_Frame *frame; @@ -677,6 +678,7 @@ static int convert_probe_point(Dwarf_Die *sp_die, struct probe_finder *pf) (uintmax_t)pf->addr); return -ENOENT; } +#endif } /* Find each argument */ @@ -956,8 +958,10 @@ int find_kprobe_trace_events(int fd, struct perf_probe_event *pev, return -EBADF; } +#if _ELFUTILS_PREREQ(0, 142) /* Get the call frame information from this dwarf */ pf.cfi = dwarf_getcfi(dbg); +#endif off = 0; line_list__init(&pf.lcache); diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h index 66f1980..e1f61dc 100644 --- a/tools/perf/util/probe-finder.h +++ b/tools/perf/util/probe-finder.h @@ -29,6 +29,7 @@ extern int find_line_range(int fd, struct line_range *lr); #include <dwarf.h> #include <libdw.h> +#include <version.h> struct probe_finder { struct perf_probe_event *pev; /* Target probe event */ @@ -44,7 +45,9 @@ struct probe_finder { struct list_head lcache; /* Line cache for lazy match */ /* For variable searching */ +#if _ELFUTILS_PREREQ(0, 142) Dwarf_CFI *cfi; /* Call Frame Information */ +#endif Dwarf_Op *fb_ops; /* Frame base attribute */ struct perf_probe_arg *pvar; /* Current target variable */ struct kprobe_trace_arg *tvar; /* Current result variable */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |