Commit 247648e3 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf tools: Fix fallback to cplus_demangle() when bfd_demangle() is not available 



In old binutils we can't access bfd_demangle(), use
cplus_demangle() just like oprofile.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Luis Claudio R. Gonçalves <lclaudio@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20090811192211.GG18061@ghostprotocols.net>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 94a24752

tools/perf/Makefile

+18 −11
Original line number Diff line number Diff line
@@ -382,24 +382,31 @@ endif 
ifdef NO_DEMANGLE

	BASIC_CFLAGS += -DNO_DEMANGLE

else



	has_bfd := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd > /dev/null 2>&1 && echo y")



	has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y")



	has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y")



	ifeq ($(has_bfd),y)

		EXTLIBS += -lbfd

	else ifeq ($(has_bfd_iberty),y)

	else

		has_bfd_iberty := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty > /dev/null 2>&1 && echo y")

		ifeq ($(has_bfd_iberty),y)

			EXTLIBS += -lbfd -liberty

	else ifeq ($(has_bfd_iberty_z),y)

		else

			has_bfd_iberty_z := $(shell sh -c "(echo '\#include <bfd.h>'; echo 'int main(void) { bfd_demangle(0, 0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -lbfd -liberty -lz > /dev/null 2>&1 && echo y")

			ifeq ($(has_bfd_iberty_z),y)

				EXTLIBS += -lbfd -liberty -lz

			else

				has_cplus_demangle := $(shell sh -c "(echo 'extern char *cplus_demangle(const char *, int);'; echo 'int main(void) { cplus_demangle(0, 0); return 0; }') | $(CC) -x c - $(ALL_CFLAGS) -o /dev/null $(ALL_LDFLAGS) -liberty > /dev/null 2>&1 && echo y")

				ifeq ($(has_cplus_demangle),y)

					EXTLIBS += -liberty

					BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE

				else

					msg := $(warning No bfd.h/libbfd found, install binutils-dev[el] to gain symbol demangling)

					BASIC_CFLAGS += -DNO_DEMANGLE

				endif

			endif

		endif

	endif

endif



ifndef CC_LD_DYNPATH

	ifdef NO_R_TO_GCC_LINKER

tools/perf/util/symbol.c

+0 −15
Original line number Diff line number Diff line
@@ -7,23 +7,8 @@ 
#include <gelf.h>

#include <elf.h>



#ifndef NO_DEMANGLE

#include <bfd.h>

#else

static inline

char *bfd_demangle(void __used *v, const char __used *c, int __used i)

{

	return NULL;

}

#endif



const char *sym_hist_filter;



#ifndef DMGL_PARAMS

#define DMGL_PARAMS      (1 << 0)       /* Include function args */

#define DMGL_ANSI        (1 << 1)       /* Include const, volatile, etc */

#endif



enum dso_origin {

	DSO__ORIG_KERNEL = 0,

	DSO__ORIG_JAVA_JIT,

tools/perf/util/symbol.h

+24 −0
Original line number Diff line number Diff line
@@ -7,6 +7,30 @@ 
#include <linux/rbtree.h>

#include "module.h"



#ifdef HAVE_CPLUS_DEMANGLE

extern char *cplus_demangle(const char *, int);



static inline char *bfd_demangle(void __used *v, const char *c, int i)

{

	return cplus_demangle(c, i);

}

#else

#ifdef NO_DEMANGLE

static inline char *bfd_demangle(void __used *v, const char __used *c,

				 int __used i)

{

	return NULL;

}

#else

#include <bfd.h>

#endif

#endif



#ifndef DMGL_PARAMS

#define DMGL_PARAMS      (1 << 0)       /* Include function args */

#define DMGL_ANSI        (1 << 1)       /* Include const, volatile, etc */

#endif



struct symbol {

	struct rb_node	rb_node;

	u64		start;

CRA Git | Maintained and supported by SUSTech CRA and CCSE