From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 14 Dec 2022 17:32:04 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v5.4.228~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04e373a45afb7cea46a8f2b27d25450935239785;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	libtraceevent-fix-build-with-binutils-2.35.patch
	series
---

diff --git a/queue-4.14/libtraceevent-fix-build-with-binutils-2.35.patch b/queue-4.14/libtraceevent-fix-build-with-binutils-2.35.patch
new file mode 100644
index 00000000000..bf1fab9c9e9
--- /dev/null
+++ b/queue-4.14/libtraceevent-fix-build-with-binutils-2.35.patch
@@ -0,0 +1,37 @@
+From 39efdd94e314336f4acbac4c07e0f37bdc3bef71 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Sat, 25 Jul 2020 02:06:23 +0100
+Subject: libtraceevent: Fix build with binutils 2.35
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+commit 39efdd94e314336f4acbac4c07e0f37bdc3bef71 upstream.
+
+In binutils 2.35, 'nm -D' changed to show symbol versions along with
+symbol names, with the usual @@ separator.  When generating
+libtraceevent-dynamic-list we need just the names, so strip off the
+version suffix if present.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Tested-by: Salvatore Bonaccorso <carnil@debian.org>
+Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
+Cc: linux-trace-devel@vger.kernel.org
+Cc: stable@vger.kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
+Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/lib/traceevent/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tools/lib/traceevent/Makefile
++++ b/tools/lib/traceevent/Makefile
+@@ -263,7 +263,7 @@ define do_generate_dynamic_list_file
+ 	xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\
+ 	if [ "$$symbol_type" = "U W" ];then				\
+ 		(echo '{';						\
+-		$(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\
++		$(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\
+ 		echo '};';						\
+ 		) > $2;							\
+ 	else								\
diff --git a/queue-4.14/series b/queue-4.14/series
new file mode 100644
index 00000000000..e1b9f4ba7c2
--- /dev/null
+++ b/queue-4.14/series
@@ -0,0 +1 @@
+libtraceevent-fix-build-with-binutils-2.35.patch