Commit ac931f87 authored by Wang Nan's avatar Wang Nan Committed by Ingo Molnar
Browse files

perf: Fix building warning on ARM 32 



Commit 85c116a6 ("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: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarNamhyung 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: default avatarIngo Molnar <mingo@kernel.org>
parent 6aaba7c9

tools/perf/util/srcline.c

+6 −6
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE