Re: git: b2b3d2a962eb - main - rtld-elf: move powerpc-specific auxv compat code into arch hook

On Mon, Nov 24, 2025 at 05:58:29AM +0000, Colin Percival wrote:
> On 11/21/25 05:33, Konstantin Belousov wrote:
> > commit b2b3d2a962eb00005641546fbe672b95e5d0672a
> > Author:     Konstantin Belousov <kib@FreeBSD.org>
> > AuthorDate: 2025-11-18 11:06:04 +0000
> > Commit:     Konstantin Belousov <kib@FreeBSD.org>
> > CommitDate: 2025-11-21 13:33:17 +0000
> > 
> >      rtld-elf: move powerpc-specific auxv compat code into arch hook
> >      Tested by:      Timothy Pearson (tpearson_raptorengineering.com)
> >      Sponsored by:   The FreeBSD Foundation
> >      MFC after:      1 week
> >      Differential revision:  https://reviews.freebsd.org/D53801
> > --- a/libexec/rtld-elf/powerpc64/reloc.c
> > +++ b/libexec/rtld-elf/powerpc64/reloc.c
> > @@ -737,3 +737,29 @@ __tls_get_addr(tls_index* ti)
> >   	return (tls_get_addr_common(_tcb_get(), ti->ti_module, ti->ti_offset +
> >   	    TLS_DTV_OFFSET));
> >   }
> > +
> > +void
> > +arch_fix_auxv(Elf_Auxinfo *aux, Elf_Auxinfo *aux_info[])
> > +{
> > +	Elf_Auxinfo *aux;
> 
> This does not compile:
> > /usr/src/libexec/rtld-elf/powerpc64/reloc.c:744:15: error: redefinition of 'aux'
> >   744 |         Elf_Auxinfo *aux;
> >       |                      ^
> > /usr/src/libexec/rtld-elf/powerpc64/reloc.c:742:28: note: previous definition is here
> 
> Which makes me wonder just how much testing this precise patch has
> received. ;-)

I ran tinderbox, and it was tested on power by Timothy Pearson.
Hm, I think I see what happen: patch was updated, then reverted, and
then I blindly took the change from the previous variant of the
differential, loosing the additional change.

I will commit the fix after my tb finishes.