Re: [PATCH] libtraceevent: Fix build with binutils 2.35

[Salvatore Bonaccorso <carnil@debian.org>]

Hi,

On Sat, Jul 25, 2020 at 02:06:23AM +0100, Ben Hutchings wrote:
> 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>
> Cc: stable@vger.kernel.org
> ---
>  tools/lib/traceevent/plugins/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/lib/traceevent/plugins/Makefile b/tools/lib/traceevent/plugins/Makefile
> index 349bb81482ab..680d883efe05 100644
> --- a/tools/lib/traceevent/plugins/Makefile
> +++ b/tools/lib/traceevent/plugins/Makefile
> @@ -197,7 +197,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                                                            \

FWIW, tested on a system with binutils 2.35 for a 5.7.10 build.

Tested-by: Salvatore Bonaccorso <carnil@debian.org>

Regards,
Salvatore



-- 
  .-.  Salvatore Bonaccorso --------------- Debian GNU/Linux Developer
  oo|  ----------------------------------------- http://www.debian.org
 /`'\  GPG key ID: 0x789D6F057FD863FE --------------------------------
(\_;/) Fingerprint: 04A4 407C B914 2C23 030C  17AE 789D 6F05 7FD8 63FE