summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2012-09-19 09:29:02 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-09-24 12:05:02 -0300
commit3ce711a6abc27abce1554e1d671a8762b7187690 (patch)
tree0ccfb37a81b6042fdfa5ddf56caf1c0cc30511a3
parent70d9304475730a63dd8da884abc7c76ee4772cd2 (diff)
downloadop-kernel-dev-3ce711a6abc27abce1554e1d671a8762b7187690.zip
op-kernel-dev-3ce711a6abc27abce1554e1d671a8762b7187690.tar.gz
perf tools: bfd.h/libbfd detection fails with recent binutils
With recent binutils I get: perf % make Makefile:668: No bfd.h/libbfd found, install binutils-dev[el]/zlib-static to gain symbol demanglin That happens because bfd.h now contains: I've reopened a bug in the hope that this check will be deleted: http://sourceware.org/bugzilla/show_bug.cgi?id=14243 But in the meantime, the following patch fixes the problem Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Paul Mackerras <paulus@samba.org> Link: http://lkml.kernel.org/r/20120919072902.GA262@x4 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/Makefile2
-rw-r--r--tools/perf/util/symbol.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 3ae6a59..251dcd7 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -715,7 +715,7 @@ else
EXTLIBS += -liberty
BASIC_CFLAGS += -DHAVE_CPLUS_DEMANGLE
else
- FLAGS_BFD=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -lbfd
+ FLAGS_BFD=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -DPACKAGE='perf' -lbfd
has_bfd := $(call try-cc,$(SOURCE_BFD),$(FLAGS_BFD))
ifeq ($(has_bfd),y)
EXTLIBS += -lbfd
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 4ff45e3..b441b07 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -34,6 +34,7 @@ static inline char *bfd_demangle(void __maybe_unused *v,
return NULL;
}
#else
+#define PACKAGE 'perf'
#include <bfd.h>
#endif
#endif
OpenPOWER on IntegriCloud