perf: fix building warning on ARM 32.
PATCH v2 1/1 perf: fix building warning on ARM 32.
Commit 85c116a6c 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.
--- tools/perf/util/srcline.c | 12 ++++++------ tools/perf/util/util.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/util/srcline.c +6 -6
@@ -20,7 +20,7 @@struct a2l_data {const char *input; -unsigned long addr; +u64 addr;bool found;const char *filename;
@@ -147,7 +147,7 @@ static void addr2line_cleanup(struct a2l_data *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) {int ret =0 ;
@@ -193,7 +193,7 @@ void dso__free_a2l(struct dso *dso)#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,struct dso *dso__maybe_unused ) {
@@ -252,7 +252,7 @@ void dso__free_a2l(struct dso *dso __maybe_unused)*/ #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) {char *file =NULL ;
@@ -293,10 +293,10 @@ out:dso__free_a2l (dso); }if (sym) { -if (asprintf (&srcline,"%s+%ld" , show_sym ? sym->name :"" , +if (asprintf (&srcline,"%s+%" PRIu64, show_sym ? sym->name :"" , addr - sym->start) <0 )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; }
tools/perf/util/util.h +1 -1
@@ -339,7 +339,7 @@ static inline int path__join3(char *bf, size_t size,struct dso ;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);void free_srcline (char *srcline);
Signature · 1 line
1.8.4
Hi Wang,
Quoted 9 lines · Wang Nan
Commit
85c116a6cintroducesasprintf()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
Quoted 6 lines
In addition, all users of
get_srcline()use u64 addr, and libbfd also use 64 bitbfd_vmaas address. This patch also fix prototype ofget_srcline()andaddr2line()to use u64 addr instead of unsigned long.Signed-off-by Wang Nan <[email protected]>
Thanks,
Namhyung
tip-bot for Wang Nan
merge bot[tip:perf/urgent] perf: Fix building warning on ARM 32
In reply to Wang Nanperf: Fix building warning on ARM 32
Commit-ID: ac931f87a647ca156f65a4c00e7297165e4fa2d8 Gitweb: http://git.kernel.org/tip/ac931f87a647ca156f65a4c00e7297165e4fa2d8 Author: Wang Nan <[email protected]> AuthorDate: Tue, 16 Dec 2014 14:19:06 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 19 Dec 2014 13:09:43 +0100
perf: Fix building warning on ARM 32
Commit 85c116a6cb91 ("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.
--- tools/perf/util/srcline.c | 12 ++++++------ tools/perf/util/util.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/util/srcline.c +6 -6
@@ -20,7 +20,7 @@struct a2l_data {const char *input; -unsigned long addr; +u64 addr;bool found;const char *filename;
@@ -147,7 +147,7 @@ static void addr2line_cleanup(struct a2l_data *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) {int ret =0 ;
@@ -193,7 +193,7 @@ void dso__free_a2l(struct dso *dso)#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,struct dso *dso__maybe_unused ) {
@@ -252,7 +252,7 @@ void dso__free_a2l(struct dso *dso __maybe_unused)*/ #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) {char *file =NULL ;
@@ -293,10 +293,10 @@ out:dso__free_a2l (dso); }if (sym) { -if (asprintf (&srcline,"%s+%ld" , show_sym ? sym->name :"" , +if (asprintf (&srcline,"%s+%" PRIu64, show_sym ? sym->name :"" , addr - sym->start) <0 )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; }
tools/perf/util/util.h +1 -1
@@ -310,7 +310,7 @@ static inline int path__join3(char *bf, size_t size,struct dso ;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);void free_srcline (char *srcline);