1 files changed, 32 insertions, 27 deletions
diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h
index 5e4050ce2963..a4086aaddb73 100644
--- a/tools/perf/util/probe-finder.h
+++ b/tools/perf/util/probe-finder.h
@@ -1,9 +1,9 @@
 #ifndef _PROBE_FINDER_H
 #define _PROBE_FINDER_H
-#define MAX_PATH_LEN 256
+#define MAX_PATH_LEN             256
-#define MAX_PROBE_BUFFER 1024
+#define MAX_PROBE_BUFFER        1024
-#define MAX_PROBES 128
+#define MAX_PROBES               128
 static inline int is_c_varname(const char *name)
 {
@@ -12,48 +12,53 @@ static inline int is_c_varname(const char *name)
 }
 struct probe_point {
-        char    *event;         /* Event name */
+        char                    *event;                 /* Event name */
-        char    *group;         /* Event group */
+        char                    *group;                 /* Event group */
        /* Inputs */
-        char    *file;          /* File name */
+        char                    *file;                  /* File name */
-        int     line;           /* Line number */
+        int                     line;                   /* Line number */
-        char    *function;      /* Function name */
+        char                    *function;              /* Function name */
-        int     offset;         /* Offset bytes */
+        int                     offset;                 /* Offset bytes */
-        int     nr_args;        /* Number of arguments */
+        int                     nr_args;                /* Number of arguments */
-        char    **args;         /* Arguments */
+        char                    **args;                 /* Arguments */
-        int     retprobe;       /* Return probe */
+        int                     retprobe;               /* Return probe */
        /* Output */
-        int     found;          /* Number of found probe points */
+        int                     found;                  /* Number of found probe points */
-        char    *probes[MAX_PROBES];    /* Output buffers (will be allocated)*/
+        char                    *probes[MAX_PROBES];    /* Output buffers (will be allocated)*/
 };
 #ifndef NO_LIBDWARF
 extern int find_probepoint(int fd, struct probe_point *pp);
-#include <libdwarf/dwarf.h>
+/* Workaround for undefined _MIPS_SZLONG bug in libdwarf.h: */
-#include <libdwarf/libdwarf.h>
+#ifndef _MIPS_SZLONG
+# define _MIPS_SZLONG           0
+#endif
+#include <dwarf.h>
+#include <libdwarf.h>
 struct probe_finder {
-        struct probe_point      *pp;    /* Target probe point */
+        struct probe_point      *pp;                    /* Target probe point */
        /* For function searching */
-        Dwarf_Addr      addr;           /* Address */
+        Dwarf_Addr              addr;                   /* Address */
-        Dwarf_Unsigned  fno;            /* File number */
+        Dwarf_Unsigned          fno;                    /* File number */
-        Dwarf_Unsigned  lno;            /* Line number */
+        Dwarf_Unsigned          lno;                    /* Line number */
-        Dwarf_Off       inl_offs;       /* Inline offset */
+        Dwarf_Off               inl_offs;               /* Inline offset */
-        Dwarf_Die       cu_die;         /* Current CU */
+        Dwarf_Die               cu_die;                 /* Current CU */
        /* For variable searching */
-        Dwarf_Addr      cu_base;        /* Current CU base address */
+        Dwarf_Addr              cu_base;                /* Current CU base address */
-        Dwarf_Locdesc   fbloc;          /* Location of Current Frame Base */
+        Dwarf_Locdesc           fbloc;                  /* Location of Current Frame Base */
-        const char      *var;           /* Current variable name */
+        const char              *var;                   /* Current variable name */
-        char            *buf;           /* Current output buffer */
+        char                    *buf;                   /* Current output buffer */
-        int             len;            /* Length of output buffer */
+        int                     len;                    /* Length of output buffer */
 };
 #endif /* NO_LIBDWARF */

diff --git a/tools/perf/util/probe-finder.h b/tools/perf/util/probe-finder.h index 5e4050ce2963..a4086aaddb73 100644 --- a/tools/perf/util/probe-finder.h +++ b/tools/perf/util/probe-finder.h
@@ -1,9 +1,9 @@
1	#ifndef _PROBE_FINDER_H	1	#ifndef _PROBE_FINDER_H
2	#define _PROBE_FINDER_H	2	#define _PROBE_FINDER_H
3		3
4	#define MAX_PATH_LEN 256	4	#define MAX_PATH_LEN 256
5	#define MAX_PROBE_BUFFER 1024	5	#define MAX_PROBE_BUFFER 1024
6	#define MAX_PROBES 128	6	#define MAX_PROBES 128
7		7
8	static inline int is_c_varname(const char *name)	8	static inline int is_c_varname(const char *name)
9	{	9	{
@@ -12,48 +12,53 @@ static inline int is_c_varname(const char *name)
12	}	12	}
13		13
14	struct probe_point {	14	struct probe_point {
15	char event; / Event name */	15	char event; / Event name */
16	char group; / Event group */	16	char group; / Event group */
17		17
18	/* Inputs */	18	/* Inputs */
19	char file; / File name */	19	char file; / File name */
20	int line; /* Line number */	20	int line; /* Line number */
21		21
22	char function; / Function name */	22	char function; / Function name */
23	int offset; /* Offset bytes */	23	int offset; /* Offset bytes */
24		24
25	int nr_args; /* Number of arguments */	25	int nr_args; /* Number of arguments */
26	char *args; / Arguments */	26	char *args; / Arguments */
27		27
28	int retprobe; /* Return probe */	28	int retprobe; /* Return probe */
29		29
30	/* Output */	30	/* Output */
31	int found; /* Number of found probe points */	31	int found; /* Number of found probe points */
32	char probes[MAX_PROBES]; / Output buffers (will be allocated)*/	32	char probes[MAX_PROBES]; / Output buffers (will be allocated)*/
33	};	33	};
34		34
35	#ifndef NO_LIBDWARF	35	#ifndef NO_LIBDWARF
36	extern int find_probepoint(int fd, struct probe_point *pp);	36	extern int find_probepoint(int fd, struct probe_point *pp);
37		37
38	#include <libdwarf/dwarf.h>	38	/* Workaround for undefined _MIPS_SZLONG bug in libdwarf.h: */
39	#include <libdwarf/libdwarf.h>	39	#ifndef _MIPS_SZLONG
		40	# define _MIPS_SZLONG 0
		41	#endif
		42
		43	#include <dwarf.h>
		44	#include <libdwarf.h>
40		45
41	struct probe_finder {	46	struct probe_finder {
42	struct probe_point pp; / Target probe point */	47	struct probe_point pp; / Target probe point */
43		48
44	/* For function searching */	49	/* For function searching */
45	Dwarf_Addr addr; /* Address */	50	Dwarf_Addr addr; /* Address */
46	Dwarf_Unsigned fno; /* File number */	51	Dwarf_Unsigned fno; /* File number */
47	Dwarf_Unsigned lno; /* Line number */	52	Dwarf_Unsigned lno; /* Line number */
48	Dwarf_Off inl_offs; /* Inline offset */	53	Dwarf_Off inl_offs; /* Inline offset */
49	Dwarf_Die cu_die; /* Current CU */	54	Dwarf_Die cu_die; /* Current CU */
50		55
51	/* For variable searching */	56	/* For variable searching */
52	Dwarf_Addr cu_base; /* Current CU base address */	57	Dwarf_Addr cu_base; /* Current CU base address */
53	Dwarf_Locdesc fbloc; /* Location of Current Frame Base */	58	Dwarf_Locdesc fbloc; /* Location of Current Frame Base */
54	const char var; / Current variable name */	59	const char var; / Current variable name */
55	char buf; / Current output buffer */	60	char buf; / Current output buffer */
56	int len; /* Length of output buffer */	61	int len; /* Length of output buffer */
57	};	62	};
58	#endif /* NO_LIBDWARF */	63	#endif /* NO_LIBDWARF */
59		64