* [PATCH 4.19 1/3] libtraceevent: Fix build with binutils 2.35
[not found] <20220530215325.921847-1-daniel.diaz@linaro.org>
@ 2022-05-30 21:53 ` Daniel Díaz
0 siblings, 0 replies; only message in thread
From: Daniel Díaz @ 2022-05-30 21:53 UTC (permalink / raw)
To: gregkh, sashal, stable
Cc: Ben Hutchings, Salvatore Bonaccorso, Steven Rostedt,
linux-trace-devel, Arnaldo Carvalho de Melo, Daniel Díaz,
open list
From: Ben Hutchings <ben@decadent.org.uk>
[ Upstream commit 39efdd94e314336f4acbac4c07e0f37bdc3bef71 ]
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: Daniel Díaz <daniel.diaz@linaro.org>
---
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 05f8a0f27121a..b7f7e4e541d7b 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.32.0
^ permalink raw reply related [flat|nested] only message in thread