Commit c2fd34d4 authored Jul 25, 2020 by Ben Hutchings Committed by Greg Kroah-Hartman Aug 05, 2020

libtraceevent: Fix build with binutils 2.35



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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2ec69499

tools/lib/traceevent/plugins/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -196,7 +196,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 \