From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hera.aquilenet.fr (hera.aquilenet.fr [IPv6:2a0c:e300::1]) by sourceware.org (Postfix) with ESMTPS id 6A2973858D32 for ; Sun, 8 Jan 2023 19:53:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6A2973858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aquilenet.fr Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aquilenet.fr Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id AF13D214; Sun, 8 Jan 2023 20:53:42 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6ZIMSN2hq0be; Sun, 8 Jan 2023 20:53:42 +0100 (CET) Received: from begin (unknown [IPv6:2a01:cb19:4a:a400:de41:a9ff:fe47:ec49]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 0CD8E26E; Sun, 8 Jan 2023 20:53:41 +0100 (CET) Received: from samy by begin with local (Exim 4.96) (envelope-from ) id 1pEbjh-006QZk-12; Sun, 08 Jan 2023 20:53:41 +0100 Date: Sun, 8 Jan 2023 20:53:41 +0100 From: Samuel Thibault To: Guy-Fleury Iteriteka Cc: libc-alpha@sourceware.org Subject: Re: [PATCH v2 3/3] htl: move pthread_self into libc Message-ID: <20230108195341.celadv4qkwr65qis@begin> References: <20230104084915.646092-1-gfleury@disroot.org> <20230104084915.646092-4-gfleury@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230104084915.646092-4-gfleury@disroot.org> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-9.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,SPF_HELO_PASS,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 @@ > . */ > > #include > - > +#include > #include > > /* 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