[kernel] r16666 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Dec  5 22:18:44 2010
New Revision: 16666

Log:
perf: Use libiberty, not libbfd, for symbol demangling (Closes: #590226, #606050)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/perf-symbols-allow-forcing-use-of-cplus_demangle.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/29
   dists/sid/linux-2.6/debian/rules.real

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Dec  5 21:40:00 2010	(r16665)
+++ dists/sid/linux-2.6/debian/changelog	Sun Dec  5 22:18:44 2010	(r16666)
@@ -13,6 +13,8 @@
   * dm: Deal with merge_bvec_fn in component devices better (Closes: #604457)
   * Update Spanish debconf template translation (Aaron H Farias Martinez)
     (Closes: #600694)
+  * perf: Use libiberty, not libbfd, for symbol demangling
+    (Closes: #590226, #606050)
 
   [ dann frazier ]
   * net: clear heap allocation for ETHTOOL_GRXCLSRLALL (CVE-2010-3861)

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/perf-symbols-allow-forcing-use-of-cplus_demangle.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/perf-symbols-allow-forcing-use-of-cplus_demangle.patch	Sun Dec  5 22:18:44 2010	(r16666)
@@ -0,0 +1,38 @@
+From: Kyle McMartin <kyle at mcmartin.ca>
+Date: Mon, 10 May 2010 16:43:35 -0400
+Subject: [PATCH] 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 at elte.hu>
+LKML-Reference: <20100510204335.GA7565 at bombadil.infradead.org>
+Signed-off-by: Kyle McMartin <kyle at redhat.com>
+Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
+---
+ tools/perf/Makefile |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/tools/perf/Makefile b/tools/perf/Makefile
+index b28bb73..0797786 100644
+--- a/tools/perf/Makefile
++++ b/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")
+ 
+-- 
+1.7.2.3
+

Modified: dists/sid/linux-2.6/debian/patches/series/29
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/29	Sun Dec  5 21:40:00 2010	(r16665)
+++ dists/sid/linux-2.6/debian/patches/series/29	Sun Dec  5 22:18:44 2010	(r16666)
@@ -10,3 +10,4 @@
 + bugfix/all/USB-don-t-enable-remote-wakeup-by-default.patch
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch
 + bugfix/all/net-clear-heap-allocation-for-ETHTOOL_GRXCLSRLALL.patch
++ bugfix/all/perf-symbols-allow-forcing-use-of-cplus_demangle.patch

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	Sun Dec  5 21:40:00 2010	(r16665)
+++ dists/sid/linux-2.6/debian/rules.real	Sun Dec  5 22:18:44 2010	(r16666)
@@ -32,7 +32,7 @@
 MAKE_CLEAN = $(setup_env) $(MAKE)
 MAKE_SELF := $(MAKE) -f debian/rules.real $(MAKEOVERRIDES)
 MAKEOVERRIDES =
-MAKE_PERF_VARS = prefix=/usr NO_PERL=1 V=2
+MAKE_PERF_VARS = prefix=/usr NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1
 
 #
 # Targets