blob: 25bc9f5b3e4553420301a2b3613d44b63321dd99 [file] [log] [blame]
Andrew Geissler7eb438a2020-11-30 19:53:16 -06001From c2fd34d4311033120fa502aa8bd4723cdeee0103 Mon Sep 17 00:00:00 2001
2From: Ben Hutchings <ben@decadent.org.uk>
3Date: Sat, 25 Jul 2020 02:06:23 +0100
4Subject: [PATCH] libtraceevent: Fix build with binutils 2.35
5
6commit 39efdd94e314336f4acbac4c07e0f37bdc3bef71 upstream.
7
8In binutils 2.35, 'nm -D' changed to show symbol versions along with
9symbol names, with the usual @@ separator. When generating
10libtraceevent-dynamic-list we need just the names, so strip off the
11version suffix if present.
12
13Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
14Tested-by: Salvatore Bonaccorso <carnil@debian.org>
15Reviewed-by: Steven Rostedt <rostedt@goodmis.org>
16Cc: linux-trace-devel@vger.kernel.org
17Cc: stable@vger.kernel.org
18Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
19Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20---
21 tools/lib/traceevent/plugins/Makefile | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile
25index f440989..23c3535 100644
26--- a/tools/lib/traceevent/plugins/Makefile
27+++ b/tools/lib/traceevent/plugins/Makefile
28@@ -196,7 +196,7 @@ define do_generate_dynamic_list_file
29 xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\
30 if [ "$$symbol_type" = "U W" ];then \
31 (echo '{'; \
32- $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\
33+ $(NM) -u -D $1 | awk 'NF>1 {sub("@.*", "", $$2); print "\t"$$2";"}' | sort -u;\
34 echo '};'; \
35 ) > $2; \
36 else \
37--
382.7.4
39