* [PATCH] libtraceevent: Fix build with binutils 2.35
@ 2020-07-25 1:06 Ben Hutchings
2020-07-25 7:06 ` Salvatore Bonaccorso
2020-07-28 12:19 ` Arnaldo Carvalho de Melo
0 siblings, 2 replies; 7+ messages in thread
From: Ben Hutchings @ 2020-07-25 1:06 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: linux-trace-devel
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
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 \
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] libtraceevent: Fix build with binutils 2.35
2020-07-25 1:06 [PATCH] libtraceevent: Fix build with binutils 2.35 Ben Hutchings
@ 2020-07-25 7:06 ` Salvatore Bonaccorso
2020-07-28 12:19 ` Arnaldo Carvalho de Melo
1 sibling, 0 replies; 7+ messages in thread
From: Salvatore Bonaccorso @ 2020-07-25 7:06 UTC (permalink / raw)
To: Ben Hutchings; +Cc: Arnaldo Carvalho de Melo, linux-trace-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] libtraceevent: Fix build with binutils 2.35
2020-07-25 1:06 [PATCH] libtraceevent: Fix build with binutils 2.35 Ben Hutchings
2020-07-25 7:06 ` Salvatore Bonaccorso
@ 2020-07-28 12:19 ` Arnaldo Carvalho de Melo
2020-07-28 13:08 ` Steven Rostedt
1 sibling, 1 reply; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-07-28 12:19 UTC (permalink / raw)
To: Steven Rostedt, Ben Hutchings; +Cc: linux-trace-devel
Em Sat, Jul 25, 2020 at 02:06:23AM +0100, Ben Hutchings escreveu:
> 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.
Steven, have you seen this one?
- Arnaldo
> 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 \
--
- Arnaldo
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] libtraceevent: Fix build with binutils 2.35
2020-07-28 12:19 ` Arnaldo Carvalho de Melo
@ 2020-07-28 13:08 ` Steven Rostedt
2020-07-29 20:59 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 7+ messages in thread
From: Steven Rostedt @ 2020-07-28 13:08 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: Ben Hutchings, linux-trace-devel
On Tue, 28 Jul 2020 09:19:08 -0300
Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> Em Sat, Jul 25, 2020 at 02:06:23AM +0100, Ben Hutchings escreveu:
> > 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.
>
> Steven, have you seen this one?
Yeah, I saw it. Just haven't gotten to it yet ;-)
-- Steve
>
> - Arnaldo
>
> > 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 \
>
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] libtraceevent: Fix build with binutils 2.35
2020-07-28 13:08 ` Steven Rostedt
@ 2020-07-29 20:59 ` Arnaldo Carvalho de Melo
2020-07-30 0:11 ` Steven Rostedt
0 siblings, 1 reply; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-07-29 20:59 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ben Hutchings, linux-trace-devel
Em Tue, Jul 28, 2020 at 09:08:06AM -0400, Steven Rostedt escreveu:
> On Tue, 28 Jul 2020 09:19:08 -0300
> Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> > Em Sat, Jul 25, 2020 at 02:06:23AM +0100, Ben Hutchings escreveu:
> > > 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.
> >
> > Steven, have you seen this one?
>
> Yeah, I saw it. Just haven't gotten to it yet ;-)
So, I've stumbled on this on debian:experimental:
LINK /tmp/build/perf/perf
/usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
/usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
/usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: syntax error in dynamic list
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile.perf:637: /tmp/build/perf/perf] Error 1
I'll tentatively add this patch to see if it then passes all the tests
everywhere...
- Arnaldo
> -- Steve
>
> >
> > - Arnaldo
> >
> > > 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 \
> >
> >
> >
>
--
- Arnaldo
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] libtraceevent: Fix build with binutils 2.35
2020-07-29 20:59 ` Arnaldo Carvalho de Melo
@ 2020-07-30 0:11 ` Steven Rostedt
2020-07-30 10:02 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 7+ messages in thread
From: Steven Rostedt @ 2020-07-30 0:11 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo; +Cc: Ben Hutchings, linux-trace-devel
On Wed, 29 Jul 2020 17:59:27 -0300
Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> Em Tue, Jul 28, 2020 at 09:08:06AM -0400, Steven Rostedt escreveu:
> > On Tue, 28 Jul 2020 09:19:08 -0300
> > Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> >
> > > Em Sat, Jul 25, 2020 at 02:06:23AM +0100, Ben Hutchings escreveu:
> > > > 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.
> > >
> > > Steven, have you seen this one?
> >
> > Yeah, I saw it. Just haven't gotten to it yet ;-)
>
> So, I've stumbled on this on debian:experimental:
>
> LINK /tmp/build/perf/perf
> /usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
> /usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
> /usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: syntax error in dynamic list
> collect2: error: ld returned 1 exit status
> make[2]: *** [Makefile.perf:637: /tmp/build/perf/perf] Error 1
>
> I'll tentatively add this patch to see if it then passes all the tests
> everywhere...
>
> -
I'd say go ahead and apply it.
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
-- Steve
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libtraceevent: Fix build with binutils 2.35
2020-07-30 0:11 ` Steven Rostedt
@ 2020-07-30 10:02 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-07-30 10:02 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Ben Hutchings, linux-trace-devel
Em Wed, Jul 29, 2020 at 08:11:43PM -0400, Steven Rostedt escreveu:
> On Wed, 29 Jul 2020 17:59:27 -0300
> Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> > Em Tue, Jul 28, 2020 at 09:08:06AM -0400, Steven Rostedt escreveu:
> > > On Tue, 28 Jul 2020 09:19:08 -0300
> > > Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
> > >
> > > > Em Sat, Jul 25, 2020 at 02:06:23AM +0100, Ben Hutchings escreveu:
> > > > > 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.
> > > >
> > > > Steven, have you seen this one?
> > >
> > > Yeah, I saw it. Just haven't gotten to it yet ;-)
> >
> > So, I've stumbled on this on debian:experimental:
> >
> > LINK /tmp/build/perf/perf
> > /usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
> > /usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: ignoring invalid character `@' in script
> > /usr/bin/ld:/tmp/build/perf/libtraceevent-dynamic-list:2: syntax error in dynamic list
> > collect2: error: ld returned 1 exit status
> > make[2]: *** [Makefile.perf:637: /tmp/build/perf/perf] Error 1
> >
> > I'll tentatively add this patch to see if it then passes all the tests
> > everywhere...
> >
> > -
>
> I'd say go ahead and apply it.
>
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Done, thanks, testing finished in all containers without build problems.
- Arnaldo
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-07-30 10:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-25 1:06 [PATCH] libtraceevent: Fix build with binutils 2.35 Ben Hutchings
2020-07-25 7:06 ` Salvatore Bonaccorso
2020-07-28 12:19 ` Arnaldo Carvalho de Melo
2020-07-28 13:08 ` Steven Rostedt
2020-07-29 20:59 ` Arnaldo Carvalho de Melo
2020-07-30 0:11 ` Steven Rostedt
2020-07-30 10:02 ` Arnaldo Carvalho de Melo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).