leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf: Fix building warning on ARM 32

Browse Source 
Commit 85c116a6cb ("perf callchain: Make get_srcline fall back to sym+offset")
introduces asprintf() call and matches '%ld' to a u64 argument, which is
incorrect on ARM:

   CC       /home/wn/util/srcline.o
 util/srcline.c: In function 'get_srcline':
 util/srcline.c:297:6: error: format '%ld' expects argument of type 'long int', but argument 4 has type 'u64' [-Werror=format]
 cc1: all warnings being treated as errors
 make[1]: *** [/home/wn/util/srcline.o] Error 1

In addition, all users of get_srcline() use u64 addr, and libbfd
also use 64 bit bfd_vma as address. This patch also fix
prototype of get_srcline() and addr2line() to use u64 addr
instead of unsigned long.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: <lizefan@huawei.com>
Cc: <a.p.zijlstra@chello.nl>
Cc: <paulus@samba.org>
Cc: <acme@kernel.org>
Cc: <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1418710746-35943-1-git-send-email-wangnan0@huawei.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Wang Nan 2014-12-16 14:19:06 +08:00 committed by Ingo Molnar
parent 6aaba7c901
commit ac931f87a6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/util/srcline.c
View File

@ -20,7 +20,7 @@
struct a2l_data { struct a2l_data {
const char *input; const char *input;
unsigned long addr; u64 addr;
bool found; bool found;
const char *filename; const char *filename;
@ -147,7 +147,7 @@ static void addr2line_cleanup(struct a2l_data *a2l)
free(a2l); free(a2l);
} }
static int addr2line(const char *dso_name, unsigned long addr, static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line, struct dso *dso) char **file, unsigned int *line, struct dso *dso)
{ {
int ret = 0; int ret = 0;
@ -193,7 +193,7 @@ void dso__free_a2l(struct dso *dso)
#else /* HAVE_LIBBFD_SUPPORT */ #else /* HAVE_LIBBFD_SUPPORT */
static int addr2line(const char *dso_name, unsigned long addr, static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line_nr, char **file, unsigned int *line_nr,
struct dso *dso __maybe_unused) struct dso *dso __maybe_unused)
{ {
@ -252,7 +252,7 @@ void dso__free_a2l(struct dso *dso __maybe_unused)
*/ */
#define A2L_FAIL_LIMIT 123 #define A2L_FAIL_LIMIT 123
char *get_srcline(struct dso *dso, unsigned long addr, struct symbol *sym, char *get_srcline(struct dso *dso, u64 addr, struct symbol *sym,
bool show_sym) bool show_sym)
{ {
char *file = NULL; char *file = NULL;
@ -293,10 +293,10 @@ out:
dso__free_a2l(dso); dso__free_a2l(dso);
} }
if (sym) { if (sym) {
if (asprintf(&srcline, "%s+%ld", show_sym ? sym->name : "", if (asprintf(&srcline, "%s+%" PRIu64, show_sym ? sym->name : "",
addr - sym->start) < 0) addr - sym->start) < 0)
return SRCLINE_UNKNOWN; return SRCLINE_UNKNOWN;
} else if (asprintf(&srcline, "%s[%lx]", dso->short_name, addr) < 0) } else if (asprintf(&srcline, "%s[%" PRIx64 "]", dso->short_name, addr) < 0)
return SRCLINE_UNKNOWN; return SRCLINE_UNKNOWN;
return srcline; return srcline;
} }

2
tools/perf/util/util.h
View File

@ -310,7 +310,7 @@ static inline int path__join3(char *bf, size_t size,
struct dso; struct dso;
struct symbol; struct symbol;
char *get_srcline(struct dso *dso, unsigned long addr, struct symbol *sym, char *get_srcline(struct dso *dso, u64 addr, struct symbol *sym,
bool show_sym); bool show_sym);
void free_srcline(char *srcline); void free_srcline(char *srcline);