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@redhat.com> Tested-by: Stephane Eranian <eranian@google.com> Reported-by: Robert Richter <robert.richter@amd.com> Cc: Ingo Molnar <mingo@elte.hu> LKML-Reference: <20100510171207.26029.97604.stgit@localhost6.localdomain6> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
94f3ca9578
Коммит
7752f1b096
|
@ -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);
|
||||
|
|
|
@ -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 */
|
||||
|
|
Загрузка…
Ссылка в новой задаче