From patchwork Tue Nov 19 00:56:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 101478 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 3F5E33858027 for ; Tue, 19 Nov 2024 00:58:37 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (domu-toccata.ens-lyon.fr [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 3BEAB3858D37 for ; Tue, 19 Nov 2024 00:56:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BEAB3858D37 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 3BEAB3858D37 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=1731977798; cv=none; b=JB0kSatL08ZwkvWUuUAXnVFZgDzg1qAEh3uR1OhMBVYQvwQ8XPfFGO6JpVEy8Vv7XJh016c8b4G75+UwGa96HvU/n3hmbTITQru+JGDeB67sSLaUMqgHDVpp8ApLDbnuyrMHbmnJeLHxbGptxtjgfKsYYFXOm2//1ER64NveOi0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1731977798; c=relaxed/simple; bh=bjD1NQISQPZZ5/JSPHVd0BW6N1tSsrfHJC+Tom28JZs=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=SoxSLMJtjGKnwdH5Jz97Abaelb+QErZFlNtuiSq2pgGbQ6chw/CHg79sA+FAp0RatcF6WEdEJWLk/n28QIFzAD8RAcrDcRSYEHT8uWNUZI34XqoQSFYh12G0zJbDd8C4LTW5Ponrtp9oH4XYffnMJ9dDksax/2HMfPX0owVDl9M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id DBC5AA1C93; Tue, 19 Nov 2024 01:56:36 +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 Mtggo-8E3Tqo; 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 8118BA1BEB; Tue, 19 Nov 2024 01:56:36 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tDCXj-0000000CrOb-45te; Tue, 19 Nov 2024 01:56:35 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited 03/13] htl move pthread_attr_getguardsize into libc. Date: Tue, 19 Nov 2024 01:56:24 +0100 Message-ID: <20241119005634.3065147-4-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 | 7 ++++++- sysdeps/htl/pt-attr-getguardsize.c | 8 +++++++- 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 - 7 files changed, 18 insertions(+), 5 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index beb39e5fea..0318f8561e 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -25,7 +25,6 @@ SYSDEPS := lockfile LCLHDRS := libpthread-routines := \ - pt-attr-getguardsize \ pt-attr-getscope \ pt-attr-getstack \ pt-attr-getstackaddr \ @@ -200,6 +199,7 @@ routines := \ pt-attr \ pt-attr-destroy \ pt-attr-getdetachstate \ + pt-attr-getguardsize \ pt-attr-getinheritsched \ pt-attr-getschedparam \ pt-attr-getschedpolicy \ diff --git a/htl/Versions b/htl/Versions index 05ef80548f..336d81bd7c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -14,6 +14,7 @@ libc { pthread_getschedparam; pthread_setschedparam; pthread_attr_destroy; + pthread_attr_getguardsize; } GLIBC_2.21 { @@ -43,6 +44,11 @@ libc { thrd_current; thrd_equal; thrd_sleep; thrd_yield; } + GLIBC_2.41 { + pthread_attr_getguardsize; + } + + GLIBC_PRIVATE { __libc_alloca_cutoff; __libc_pthread_init; @@ -79,7 +85,6 @@ libpthread { pthread_atfork; - pthread_attr_getguardsize; pthread_attr_getscope; pthread_attr_getstack; pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setguardsize; diff --git a/sysdeps/htl/pt-attr-getguardsize.c b/sysdeps/htl/pt-attr-getguardsize.c index e9e56d0d60..986e212440 100644 --- a/sysdeps/htl/pt-attr-getguardsize.c +++ b/sysdeps/htl/pt-attr-getguardsize.c @@ -17,11 +17,17 @@ . */ #include +#include #include int -pthread_attr_getguardsize (const pthread_attr_t *attr, size_t * guardsize) +__pthread_attr_getguardsize (const pthread_attr_t *attr, size_t * guardsize) { *guardsize = attr->__guardsize; return 0; } +versioned_symbol (libpthread, __pthread_attr_getguardsize, pthread_attr_getguardsize, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_attr_getguardsize, pthread_attr_getguardsize, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 83c3218398..0a6f990c09 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -31,6 +31,7 @@ GLIBC_2.11 mkstemps64 F GLIBC_2.12 __pthread_self F GLIBC_2.12 pthread_attr_destroy F GLIBC_2.12 pthread_attr_getdetachstate F +GLIBC_2.12 pthread_attr_getguardsize F GLIBC_2.12 pthread_attr_getinheritsched F GLIBC_2.12 pthread_attr_getschedparam F GLIBC_2.12 pthread_attr_getschedpolicy F @@ -2483,6 +2484,7 @@ GLIBC_2.4 readlinkat F GLIBC_2.4 renameat F GLIBC_2.4 symlinkat F GLIBC_2.4 unlinkat F +GLIBC_2.41 pthread_attr_getguardsize 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 f8f5daf567..3451543da5 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -22,7 +22,6 @@ GLIBC_2.12 flockfile F GLIBC_2.12 ftrylockfile F GLIBC_2.12 funlockfile F GLIBC_2.12 pthread_atfork F -GLIBC_2.12 pthread_attr_getguardsize F GLIBC_2.12 pthread_attr_getscope F GLIBC_2.12 pthread_attr_getstack F GLIBC_2.12 pthread_attr_getstackaddr F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 7c685645bb..ca72304ddc 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1513,6 +1513,7 @@ GLIBC_2.38 psiginfo F GLIBC_2.38 psignal F GLIBC_2.38 pthread_attr_destroy F GLIBC_2.38 pthread_attr_getdetachstate F +GLIBC_2.38 pthread_attr_getguardsize F GLIBC_2.38 pthread_attr_getinheritsched F GLIBC_2.38 pthread_attr_getschedparam F GLIBC_2.38 pthread_attr_getschedpolicy F @@ -2184,6 +2185,7 @@ GLIBC_2.39 stdc_trailing_zeros_ui F 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 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 54b3e34b9b..556cc6e2af 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -39,7 +39,6 @@ GLIBC_2.38 mtx_lock F GLIBC_2.38 mtx_timedlock F GLIBC_2.38 mtx_trylock F GLIBC_2.38 mtx_unlock F -GLIBC_2.38 pthread_attr_getguardsize F GLIBC_2.38 pthread_attr_getscope F GLIBC_2.38 pthread_attr_getstack F GLIBC_2.38 pthread_attr_getstackaddr F