From patchwork Tue Nov 19 00:56:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 101479 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ED45F385843B for ; Tue, 19 Nov 2024 00:58:53 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 0C45A3858CD9 for ; Tue, 19 Nov 2024 00:56:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0C45A3858CD9 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0C45A3858CD9 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.77.166.138 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731977802; cv=none; b=acNssJg9YIRCt4DV1pqRyQXvGaFlFR/aBwfn0z429Vd7rzIKxrgQkqH1Ud6ZfWtKLnMYfj/oJSTWXn/nVOpZcx9bVSBREg1jJC6DnbHrDTxTdAyxTb9cLoZItyXCdHdPaV6U5Dh5rxrLZkq5vh8PL0N9fzA+VaV3LLTR1qt3FoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731977802; c=relaxed/simple; bh=gBcYtRRmS+Uzdls7b8eBK8SEi5xc3eEd2QN+LG8FZDo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=HFRj3sg5nAXWH6LOsgFR1Vtt/JUUAmIpbNaoSwIUscFK0ROmeORQxR/V/gfDjmheXuhzj4IfuIyBajmBO2tJUjeTDlmNNK3gZX0jf30jzwWs2l9sphgSxuB+0r9fC2Ojo00m9dAsNBQ0pGod6VVwJ6KbwnyOhirq+5mcGXnYRqE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0C45A3858CD9 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 07F00A1BEB; Tue, 19 Nov 2024 01:56:37 +0100 (CET) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TNGH5sEHtf5e; Tue, 19 Nov 2024 01:56:36 +0100 (CET) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 91950A1C13; Tue, 19 Nov 2024 01:56:36 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tDCXk-0000000CrOh-0HfT; Tue, 19 Nov 2024 01:56:36 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited 05/13] htl move pthread_attr_getstacksize into libc. Date: Tue, 19 Nov 2024 01:56:26 +0100 Message-ID: <20241119005634.3065147-6-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241119005634.3065147-1-samuel.thibault@ens-lyon.org> References: <20241119005634.3065147-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.1 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: gfleury Signed-off-by: gfleury --- htl/Makefile | 2 +- htl/Versions | 5 ++++- sysdeps/htl/pt-attr-getstacksize.c | 8 +++++++- sysdeps/htl/pthreadP.h | 1 + sysdeps/mach/hurd/i386/libc.abilist | 2 ++ sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libc.abilist | 2 ++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 8 files changed, 17 insertions(+), 5 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index d8a5757d0b..a4d900d5ff 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -27,7 +27,6 @@ LCLHDRS := libpthread-routines := \ pt-attr-getstack \ pt-attr-getstackaddr \ - pt-attr-getstacksize \ pt-attr-init \ pt-attr-setguardsize \ pt-attr-setschedparam \ @@ -203,6 +202,7 @@ routines := \ pt-attr-getschedparam \ pt-attr-getschedpolicy \ pt-attr-getscope \ + pt-attr-getstacksize \ pt-attr-setdetachstate \ pt-attr-setinheritsched \ pt-attr-setschedpolicy \ diff --git a/htl/Versions b/htl/Versions index 4372c2de8f..deca0d4109 100644 --- a/htl/Versions +++ b/htl/Versions @@ -16,6 +16,7 @@ libc { pthread_attr_destroy; pthread_attr_getguardsize; pthread_attr_getscope; + pthread_attr_getstacksize; } GLIBC_2.21 { @@ -47,6 +48,7 @@ libc { GLIBC_2.41 { pthread_attr_getguardsize; + pthread_attr_getstacksize; } @@ -58,6 +60,7 @@ libc { ___pthread_self; __pthread_init_thread; __pthread_default_attr; + __pthread_attr_getstacksize; } } @@ -87,7 +90,7 @@ libpthread { pthread_atfork; pthread_attr_getstack; pthread_attr_getstackaddr; - pthread_attr_getstacksize; pthread_attr_init; + pthread_attr_init; pthread_attr_setguardsize; pthread_attr_setschedparam; pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr; diff --git a/sysdeps/htl/pt-attr-getstacksize.c b/sysdeps/htl/pt-attr-getstacksize.c index 1f05fe0d85..45589aa070 100644 --- a/sysdeps/htl/pt-attr-getstacksize.c +++ b/sysdeps/htl/pt-attr-getstacksize.c @@ -17,6 +17,7 @@ . */ #include +#include #include int @@ -25,4 +26,9 @@ __pthread_attr_getstacksize (const pthread_attr_t *attr, size_t * stacksize) *stacksize = attr->__stacksize; return 0; } -weak_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize) +libc_hidden_def (__pthread_attr_getstacksize) +versioned_symbol (libc, __pthread_attr_getstacksize, pthread_attr_getstacksize, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_attr_getstacksize,pthread_attr_getstacksize, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index b0c9ceb23a..9aef867708 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -86,6 +86,7 @@ int __pthread_attr_getstackaddr (const pthread_attr_t *__restrict __attr, int __pthread_attr_setstackaddr (pthread_attr_t *__attr, void *__stackaddr); int __pthread_attr_getstacksize (const pthread_attr_t *__restrict __attr, size_t *__restrict __stacksize); +libc_hidden_proto (__pthread_attr_getstacksize) int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize); int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr, size_t __stacksize); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 8dd66f4a64..cb577ababf 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -36,6 +36,7 @@ GLIBC_2.12 pthread_attr_getinheritsched F GLIBC_2.12 pthread_attr_getschedparam F GLIBC_2.12 pthread_attr_getschedpolicy F GLIBC_2.12 pthread_attr_getscope F +GLIBC_2.12 pthread_attr_getstacksize F GLIBC_2.12 pthread_attr_setdetachstate F GLIBC_2.12 pthread_attr_setinheritsched F GLIBC_2.12 pthread_attr_setschedpolicy F @@ -2486,6 +2487,7 @@ GLIBC_2.4 renameat F GLIBC_2.4 symlinkat F GLIBC_2.4 unlinkat F GLIBC_2.41 pthread_attr_getguardsize F +GLIBC_2.41 pthread_attr_getstacksize F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 03fcee4ce6..8d700ff448 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -24,7 +24,6 @@ GLIBC_2.12 funlockfile F GLIBC_2.12 pthread_atfork F GLIBC_2.12 pthread_attr_getstack F GLIBC_2.12 pthread_attr_getstackaddr F -GLIBC_2.12 pthread_attr_getstacksize F GLIBC_2.12 pthread_attr_init F GLIBC_2.12 pthread_attr_setguardsize F GLIBC_2.12 pthread_attr_setschedparam F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index ca72304ddc..c0bf7367c6 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1518,6 +1518,7 @@ GLIBC_2.38 pthread_attr_getinheritsched F GLIBC_2.38 pthread_attr_getschedparam F GLIBC_2.38 pthread_attr_getschedpolicy F GLIBC_2.38 pthread_attr_getscope F +GLIBC_2.38 pthread_attr_getstacksize F GLIBC_2.38 pthread_attr_init F GLIBC_2.38 pthread_attr_setdetachstate F GLIBC_2.38 pthread_attr_setinheritsched F @@ -2186,6 +2187,7 @@ GLIBC_2.39 stdc_trailing_zeros_ul F GLIBC_2.39 stdc_trailing_zeros_ull F GLIBC_2.39 stdc_trailing_zeros_us F GLIBC_2.41 pthread_attr_getguardsize F +GLIBC_2.41 pthread_attr_getstacksize F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F HURD_CTHREADS_0.3 __cthread_setspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 1d18972651..c0bfe11d03 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -41,7 +41,6 @@ GLIBC_2.38 mtx_trylock F GLIBC_2.38 mtx_unlock F GLIBC_2.38 pthread_attr_getstack F GLIBC_2.38 pthread_attr_getstackaddr F -GLIBC_2.38 pthread_attr_getstacksize F GLIBC_2.38 pthread_attr_init F GLIBC_2.38 pthread_attr_setguardsize F GLIBC_2.38 pthread_attr_setschedparam F