Re: [PATCH v2 3/3] htl: move pthread_self into libc

[Samuel Thibault <samuel.thibault@aquilenet.fr>]

Guy-Fleury Iteriteka via Libc-alpha, le mer. 04 janv. 2023 10:49:15 +0200, a ecrit:
> diff --git a/htl/pt-self.c b/htl/pt-self.c
> index e05ec69b..f8c0b144 100644
> --- a/htl/pt-self.c
> +++ b/htl/pt-self.c
> @@ -17,7 +17,7 @@
>     <https://www.gnu.org/licenses/>.  */
>  
>  #include <pthread.h>
> -
> +#include <shlib-compat.h>
>  #include <pt-internal.h>
>  
>  /* Return the thread ID of the calling thread.  */
> @@ -36,4 +36,13 @@ __pthread_self (void)
>    return self->thread;
>  }
>  
> -weak_alias (__pthread_self, pthread_self);
> +libc_hidden_def (__pthread_self)
> +versioned_symbol (libc, __pthread_self, pthread_self, GLIBC_2_37);
> +
> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_37)
> +compat_symbol (libc, __pthread_self, pthread_self, GLIBC_2_12);
> +#endif



> +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_21, GLIBC_2_37)
> +compat_symbol (libc, __pthread_self, pthread_self, GLIBC_2_21);
> +#endif

I really believe this one should be

#if SHLIB_COMPAT (libc, GLIBC_2_21, GLIBC_2_37)
compat_symbol (libc, __pthread_self, pthread_self, GLIBC_2_21);
#endif

since version 2.21 of pthread_self was already in libc.

> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index 4e3200ef..29b08e73 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -28,6 +28,7 @@ GLIBC_2.11 mkostemps F
>  GLIBC_2.11 mkostemps64 F
>  GLIBC_2.11 mkstemps F
>  GLIBC_2.11 mkstemps64 F
> +GLIBC_2.12 pthread_self F
>  GLIBC_2.13 __fentry__ F
>  GLIBC_2.14 syncfs F
>  GLIBC_2.15 __fdelt_chk F

You also need to add __pthread_self which you removed from
libpthread.abilist. Really, run

make -C $src_dir/elf objdir=$PWD subdir=elf ..=../ $PWD/elf/check-abi-libc.out

and see the out file to check that you have gotten them right.

Samuel