From 7a6970a26ba70db99bd68e4d95855cfcc3af9625 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Mon, 10 May 2010 16:43:35 -0400
Subject: [PATCH] --- yaml --- r: 191350 b: refs/heads/master c:
 d11c7addfe0fa501cb54c824c0fac3481d527433 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/tools/perf/Makefile | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4cbf399bf871..c6a7e999f417 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b3c4ef50441e85dc9b2c9b67e95e8ad1185c15e
+refs/heads/master: d11c7addfe0fa501cb54c824c0fac3481d527433
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index b28bb7359b14..0797786aa72a 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/tools/perf/Makefile
@@ -592,6 +592,9 @@ endif
 
 ifdef NO_DEMANGLE
 	BASIC_CFLAGS += -DNO_DEMANGLE
+else ifdef HAVE_CPLUS_DEMANGLE
+	EXTLIBS += -liberty
+	BASIC_CFLAGS += -DHAVE_CPLUS_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 $(BITBUCKET) $(ALL_LDFLAGS) $(EXTLIBS) -lbfd "$(QUIET_STDERR)" && echo y")