Em Mon, Nov 24, 2014 at 12:32:04PM -0300, Arnaldo Carvalho de Melo escreveu: > > ^ > > In file included from util/srcline.c:11:0: > > util/symbol.h:35:21: note: previous definition of ‘bfd_demangle’ was > > here > > static inline char *bfd_demangle(void __maybe_unused *v, > > ^ > > make[1]: *** [util/srcline.o] Error 1 > > make: *** [util/srcline.o] Error 2 > > make: Leaving directory `/home/git/linux/tools/perf' > > [acme@zoo linux]$ > > bisected it down to:
What I have is on the perf/branch-history branch, we can't both include bfd.h and symbol.h when NO_DEMANGLE=1, probably we should just move the stub inline to symbol-elf.c, its only user, but I have to check further, lunch time tho. - Arnaldo > 43e3229ef07a2dda81bda86a5b81ef8c2890ab63 is the first bad commit > commit 43e3229ef07a2dda81bda86a5b81ef8c2890ab63 > Author: Andi Kleen <[email protected]> > Date: Wed Nov 12 18:05:27 2014 -0800 > > perf callchain: Make get_srcline fall back to sym+offset > > When the source line is not found fall back to sym + offset. This is > generally much more useful than a raw address. > > For this we need to pass in the symbol from the caller. > > For some callers it's awkward to compute, so we stay at the old > behaviour. > > Signed-off-by: Andi Kleen <[email protected]> > Cc: Jiri Olsa <[email protected]> > Cc: Namhyung Kim <[email protected]> > Link: > http://lkml.kernel.org/r/[email protected] > Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> > > :040000 040000 ae5e95c8dbfd9ab8e836707fcb2904e263f872c6 > 5979ba316f1d317c59866b0c3bf92c39fbdcde6b M tools > [acme@zoo linux]$ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
