From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 5E4643858D32 for ; Sun, 8 Jan 2023 20:16:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5E4643858D32 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B4E9A410CF; Sun, 8 Jan 2023 21:16:07 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TxHstEP8nxnb; Sun, 8 Jan 2023 21:16:06 +0100 (CET) Date: Sun, 08 Jan 2023 22:16:00 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1673208966; bh=/4AMb5T5xAZ0th34s0YQ+7dDTlTUjsGKSrlgaj7kdUg=; h=Date:From:To:CC:Subject:In-Reply-To:References; b=NgdLDleRKK1ATwWbHCA3ZSNezppC1D8KY2htTkxh93Ryeh8ko2KzQcDuYheDuYoFX Z0Y6w00j5fFeQLTQReqav39PwATVgeRSNEd0RTzGUvi7+XJr20kDp0yzC62gCrwKFr D5gXRfWI1PPoLUJOH8wXW0QuKSeRdbRyTXgU+1fLt4RO0+Gs+npF/NIHuZA6w7FhwO 97xqCQB2AtM5D56UgMSUlW/dD6jtpC6KykjshgSna/3Lh36icrwHw877jATV9LFl01 ix+HG3k9JMUe+ELpJI1e67XgYfqNKw2tdFLtCdLJZVJW3d/wYxkoa5RzEXayxKsOXH 0H0AmpUXyMuqQ== From: Guy-Fleury Iteriteka To: Samuel Thibault CC: libc-alpha@sourceware.org Subject: Re: [PATCH v2 3/3] htl: move pthread_self into libc In-Reply-To: <20230108195341.celadv4qkwr65qis@begin> References: <20230104084915.646092-1-gfleury@disroot.org> <20230104084915.646092-4-gfleury@disroot.org> <20230108195341.celadv4qkwr65qis@begin> Message-ID: <0D04A2C2-78AA-48A0-B0CB-B46B579C8F18@disroot.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,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: Hello, On January 8, 2023 9:53:41 PM GMT+02:00, Samuel Thibault wrote: >Guy-Fleury Iteriteka via Libc-alpha, le mer=2E 04 janv=2E 2023 10:49:15 += 0200, a ecrit: >> diff --git a/htl/pt-self=2Ec b/htl/pt-self=2Ec >> index e05ec69b=2E=2Ef8c0b144 100644 >> --- a/htl/pt-self=2Ec >> +++ b/htl/pt-self=2Ec >> @@ -17,7 +17,7 @@ >> =2E */ >> =20 >> #include >> - >> +#include >> #include >> =20 >> /* Return the thread ID of the calling thread=2E */ >> @@ -36,4 +36,13 @@ __pthread_self (void) >> return self->thread; >> } >> =20 >> -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 Ok > >since version 2=2E21 of pthread_self was already in libc=2E > >> diff --git a/sysdeps/mach/hurd/i386/libc=2Eabilist b/sysdeps/mach/hurd/= i386/libc=2Eabilist >> index 4e3200ef=2E=2E29b08e73 100644 >> --- a/sysdeps/mach/hurd/i386/libc=2Eabilist >> +++ b/sysdeps/mach/hurd/i386/libc=2Eabilist >> @@ -28,6 +28,7 @@ GLIBC_2=2E11 mkostemps F >> GLIBC_2=2E11 mkostemps64 F >> GLIBC_2=2E11 mkstemps F >> GLIBC_2=2E11 mkstemps64 F >> +GLIBC_2=2E12 pthread_self F >> GLIBC_2=2E13 __fentry__ F >> GLIBC_2=2E14 syncfs F >> GLIBC_2=2E15 __fdelt_chk F > >You also need to add __pthread_self which you removed from >libpthread=2Eabilist=2E Really, run > Ok >make -C $src_dir/elf objdir=3D$PWD subdir=3Delf =2E=2E=3D=2E=2E/ $PWD/elf= /check-abi-libc=2Eout > >and see the out file to check that you have gotten them right=2E Thanks will do that=2E=20 > >Samuel