From 1d47c4400a288dee33395a44af6c276ed7eae85e Mon Sep 17 00:00:00 2001
|
From: Ben Hutchings <ben@decadent.org.uk>
|
Date: Sat, 25 Jul 2020 02:06:23 +0100
|
Subject: [PATCH 4/7] libtraceevent: Fix build with binutils 2.35
|
|
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>
|
(cherry picked from commit 39efdd94e314336f4acbac4c07e0f37bdc3bef71)
|
|
Conflicts:
|
tools/lib/traceevent/plugins/Makefile
|
|
Change-Id: Icec6ced8322a4e0a2aafe4edcb133b0335764032
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
---
|
tools/lib/traceevent/Makefile | 2 +-
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
|
index 05f8a0f27121..1a17d20a8a46 100644
|
--- 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 \
|
--
|
2.20.1
|
