Andrew Geissler | 7eb438a | 2020-11-30 19:53:16 -0600 | [diff] [blame] | 1 | From c2fd34d4311033120fa502aa8bd4723cdeee0103 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ben Hutchings <ben@decadent.org.uk> |
| 3 | Date: Sat, 25 Jul 2020 02:06:23 +0100 |
| 4 | Subject: [PATCH] libtraceevent: Fix build with binutils 2.35 |
| 5 | |
| 6 | commit 39efdd94e314336f4acbac4c07e0f37bdc3bef71 upstream. |
| 7 | |
| 8 | In binutils 2.35, 'nm -D' changed to show symbol versions along with |
| 9 | symbol names, with the usual @@ separator. When generating |
| 10 | libtraceevent-dynamic-list we need just the names, so strip off the |
| 11 | version suffix if present. |
| 12 | |
| 13 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| 14 | Tested-by: Salvatore Bonaccorso <carnil@debian.org> |
| 15 | Reviewed-by: Steven Rostedt <rostedt@goodmis.org> |
| 16 | Cc: linux-trace-devel@vger.kernel.org |
| 17 | Cc: stable@vger.kernel.org |
| 18 | Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| 19 | Signed-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 | |
| 24 | diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile |
| 25 | index 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 | -- |
| 38 | 2.7.4 |
| 39 | |