Re: [PATCH 1/2] Map ABI/VERSION of rtld to ABI/VERSION of ld [BZ #28132]

[Carlos O'Donell via Libc-alpha <libc-alpha@sourceware.org>]

On Sun, Aug 01, 2021 at 09:29:39PM -0700, H.J. Lu via Libc-alpha wrote:
> Since the module name of ld is rtld, map ABI/VERSION of rtld to ABI/VERSION
> of ld.  This fixes BZ #28132.

Reviewing old patches that are still outstanding as part of the queue
review in patchwork. Hopefully we catch up to the point where I'm not
reviewing year old patches in the queue. However, some of these patches
are interesting and valuable so I'm reviving them to review potential
solutions.

In scripts/gen-libc-modules.awk we have this code:
 21   if (name == "ld")
 22     name = "rtld"

This means we are already handling this processing in other places. A
clean solution needs to consider:

scripts/abi-version.awk (no changes, should just use rtld)
scripts/gen-libc-modules.awk (ld vs rtld)
shlib-versions (ld=...)

It feels like we need to refactor from the top just use rtld everywhere
we accidentally used ld as our identifier.

> ---
>  scripts/abi-versions.awk | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/scripts/abi-versions.awk b/scripts/abi-versions.awk
> index c369793459..09c9432f5c 100644
> --- a/scripts/abi-versions.awk
> +++ b/scripts/abi-versions.awk
> @@ -27,6 +27,11 @@ $2 == "=" {
>  
>    printf "#define ABI_%s_%s\tABI_%s_%s\n", libid, oldid, libid, newid;
>    printf "#define VERSION_%s_%s\t%s\n", libid, oldid, new;
> +  if (libid == "ld") {
> +    # The module name of ld is rtld.
> +    printf "#define ABI_rtld_%s\tABI_ld_%s\n", oldid, oldid
> +    printf "#define VERSION_rtld_%s\tVERSION_ld_%s\n", oldid, oldid
> +  }
>  
>    next;
>  }
> @@ -38,6 +43,11 @@ $2 == "=" {
>  
>    printf "#define ABI_%s_%s\t%d\t/* support %s */\n", libid, versid, ++n, vers;
>    printf "#define VERSION_%s_%s\t%s\n", libid, versid, vers;
> +  if (libid == "ld") {
> +    # The module name of ld is rtld.
> +    printf "#define ABI_rtld_%s\tABI_ld_%s\n", versid, versid
> +    printf "#define VERSION_rtld_%s\tVERSION_ld_%s\n", versid, versid
> +  }
>    next;
>  }
>  
> -- 
> 2.31.1
>