perf symbols: Move bfd_demangle stubbing to its only user
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: aaba4e12a99cc56fc8614a3f2a3ec6db4fcde76e Gitweb: http://git.kernel.org/tip/aaba4e12a99cc56fc8614a3f2a3ec6db4fcde76e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 24 Nov 2014 17:10:52 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 24 Nov 2014 18:03:47 -0300
perf symbols: Move bfd_demangle stubbing to its only user
We need to define bfd_demangle() to either a wrapper for cplus_demangle() or to a stub when NO_DEMANGLE is defined.
That is at odds with using bfd.h for some other reason, as it defines bfd_demangle() and then if code that wants to use symbol.h, where the above stubbing/wrapping is done, and bfd.h for other reasons, we end up with a build error where bfd_demangle() is found to be redefined.
Avoid that by moving the stubbing/wrapping to symbol-elf.c, that is the only user of such function. If we ever get to a point where there are more valid users, we can then introduce a header for that.
Cc Adrian Hunter <[email protected]>
Cc Andi Kleen <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/symbol-elf.c | 21 +++++++++++++++++++++ tools/perf/util/symbol.h | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-)
tools/perf/util/symbol-elf.c +21 -0
@@ -11,6 +11,27 @@#include <symbol/kallsyms.h> #include "debug.h" +#ifdef HAVE_CPLUS_DEMANGLE_SUPPORT +extern char *cplus_demangle (const char *,int ); + +static inline char *bfd_demangle (void __maybe_unused *v,const char *c,int i) +{ +return cplus_demangle (c, i); +} +#else +#ifdef NO_DEMANGLE +static inline char *bfd_demangle (void __maybe_unused *v, +const char __maybe_unused *c, +int __maybe_unused i) +{ +return NULL ; +} +#else +#define PACKAGE 'perf' +#include <bfd.h> +#endif +#endif +#ifndef HAVE_ELF_GETPHDRNUM_SUPPORT static int elf_getphdrnum (Elf *elf,size_t *dst) {
tools/perf/util/symbol.h +0 -21
@@ -23,27 +23,6 @@#include "dso.h" -#ifdef HAVE_CPLUS_DEMANGLE_SUPPORT -extern char *cplus_demangle (const char *,int ); - -static inline char *bfd_demangle (void __maybe_unused *v,const char *c,int i) -{ -return cplus_demangle (c, i); -} -#else -#ifdef NO_DEMANGLE -static inline char *bfd_demangle (void __maybe_unused *v, -const char __maybe_unused *c, -int __maybe_unused i) -{ -return NULL ; -} -#else -#define PACKAGE 'perf' -#include <bfd.h> -#endif -#endif -/* * libelf 0.8.x and earlier do not support ELF_C_READ_MMAP; * for newer versions we can use mmap to reduce memory usage: