perf symbols: Move bfd_demangle stubbing to its only user (aaba4e12) · Commits · 戴 / test

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 <adrian.hunter@intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: David Ahern <dsahern@gmail.com> Cc: Don Zickus <dzickus@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-6wzjpe2fy9xtgchshulixlzw@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/symbol-elf.c

+21 −0

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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:

Admin message