aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-05-10 16:43:35 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-09 15:55:30 -0700
commitcdcf58a4ed7461f9e4584ca1b2b46eb4bbd12811 (patch)
tree6ecc422dd98571015d66a72bf67b552260b9a47a
parent581f07ec9f17bcfea2e47e249c459895e65ba314 (diff)
perf symbols: allow forcing use of cplus_demangle
commit d11c7addfe0fa501cb54c824c0fac3481d527433 upstream. For Fedora, I want to force perf to link against libiberty.a for cplus_demangle, rather than libbfd.a for bfd_demangle due to licensing insanity on binutils. (libiberty is LGPL2, libbfd is GPL3.) If we just rely on autodetection, we'll end up with libbfd linked against us, since they're both in binutils-static in the buildroot. Cc: Ingo Molnar <mingo@elte.hu> LKML-Reference: <20100510204335.GA7565@bombadil.infradead.org> Signed-off-by: Kyle McMartin <kyle@redhat.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--tools/perf/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 04f8ee5d8cd..e5c942b6825 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -450,6 +450,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")