From 04e373a45afb7cea46a8f2b27d25450935239785 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Dec 2022 18:32:04 +0100 Subject: [PATCH] 4.14-stable patches added patches: libtraceevent-fix-build-with-binutils-2.35.patch series --- ...ceevent-fix-build-with-binutils-2.35.patch | 37 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.14/libtraceevent-fix-build-with-binutils-2.35.patch create mode 100644 queue-4.14/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 +Date: Sat, 25 Jul 2020 02:06:23 +0100 +Subject: libtraceevent: Fix build with binutils 2.35 + +From: Ben Hutchings + +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 +Tested-by: Salvatore Bonaccorso +Reviewed-by: Steven Rostedt +Cc: linux-trace-devel@vger.kernel.org +Cc: stable@vger.kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Christophe Leroy +Signed-off-by: Greg Kroah-Hartman +--- + 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 -- 2.47.3