From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 1 Jun 2020 16:48:39 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.226~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30ebb08ce92bb0d4e9ee970967e2b3be3ff64310;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	perf-make-perf-able-to-build-with-latest-libbfd.patch
---

diff --git a/queue-5.4/perf-make-perf-able-to-build-with-latest-libbfd.patch b/queue-5.4/perf-make-perf-able-to-build-with-latest-libbfd.patch
new file mode 100644
index 00000000000..088b2ac246f
--- /dev/null
+++ b/queue-5.4/perf-make-perf-able-to-build-with-latest-libbfd.patch
@@ -0,0 +1,61 @@
+From 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 Mon Sep 17 00:00:00 2001
+From: Changbin Du <changbin.du@intel.com>
+Date: Tue, 28 Jan 2020 23:29:38 +0800
+Subject: perf: Make perf able to build with latest libbfd
+
+From: Changbin Du <changbin.du@gmail.com>
+
+commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 upstream.
+
+libbfd has changed the bfd_section_* macros to inline functions
+bfd_section_<field> since 2019-09-18. See below two commits:
+  o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
+  o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html
+
+This fix make perf able to build with both old and new libbfd.
+
+Signed-off-by: Changbin Du <changbin.du@gmail.com>
+Acked-by: Jiri Olsa <jolsa@redhat.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Cc: Marek Vasut <marex@denx.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/perf/util/srcline.c |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+--- a/tools/perf/util/srcline.c
++++ b/tools/perf/util/srcline.c
+@@ -193,16 +193,30 @@ static void find_address_in_section(bfd
+ 	bfd_vma pc, vma;
+ 	bfd_size_type size;
+ 	struct a2l_data *a2l = data;
++	flagword flags;
+ 
+ 	if (a2l->found)
+ 		return;
+ 
+-	if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
++#ifdef bfd_get_section_flags
++	flags = bfd_get_section_flags(abfd, section);
++#else
++	flags = bfd_section_flags(section);
++#endif
++	if ((flags & SEC_ALLOC) == 0)
+ 		return;
+ 
+ 	pc = a2l->addr;
++#ifdef bfd_get_section_vma
+ 	vma = bfd_get_section_vma(abfd, section);
++#else
++	vma = bfd_section_vma(section);
++#endif
++#ifdef bfd_get_section_size
+ 	size = bfd_get_section_size(section);
++#else
++	size = bfd_section_size(section);
++#endif
+ 
+ 	if (pc < vma || pc >= vma + size)
+ 		return;
diff --git a/queue-5.4/series b/queue-5.4/series
index 1662207c804..a8df7a51e53 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -139,3 +139,4 @@ revert-input-i8042-add-thinkpad-s230u-to-i8042-nomux-list.patch
 netfilter-conntrack-comparison-of-unsigned-in-cthelper-confirmation.patch
 netfilter-conntrack-pass-value-of-ctinfo-to-__nf_conntrack_update.patch
 netfilter-nf_conntrack_pptp-fix-compilation-warning-with-w-1-build.patch
+perf-make-perf-able-to-build-with-latest-libbfd.patch