From patchwork Thu Jan 2 00:56:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103857 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 C917D385783C for ; Thu, 2 Jan 2025 00:57:16 +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 DC82D3857C7B for ; Thu, 2 Jan 2025 00:56:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC82D3857C7B 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 DC82D3857C7B 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=1735779389; cv=none; b=C4hufd0FiYFTqc/8zijSP2eEexUai8sNLM+nlRl7jgLEyvY+lpNJ+FJTaFUv8/0c2dLx7Mp75A6mocWXgIRFYxHzHB1KvbJvkvFWrGv8nCQGfRi8LyfstJc4eTkh7EiGlZsaGcT90LWHpWuhB/x4Lue6TG0xJ+GM8fCUE1Aqwn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779389; c=relaxed/simple; bh=DbXD6vQb+b8jo4HQOSLGci0VK6Ts0F/0CCzBMVJVmsc=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=fupdc8NJoOFTRYRBKb/F4zHYV1RDH2iiMGPU4IH3Sd3ydOt1upuLk5fCzTn5+8zptI0yXW+xq2Ta9XudPlQAtSvfj1K20u6LJ3NEm8WB4AwDt4QnPbOl95m63b0HTJ8fc1v2etchWId7ctwNEP4/3Mc6PcBz1pVicY9SHjXHXAc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DC82D3857C7B Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id CAEB3A03B4; Thu, 2 Jan 2025 01:56:27 +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 UdT1Me8M9iyx; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 80D93A03B6; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v1n-0Mxd; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited 1/8] htl: move pthread_mutexattr_init into libc. Date: Thu, 2 Jan 2025 01:56:19 +0100 Message-ID: <20250102005626.2364140-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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 Message-ID: <20241231134909.1166440-2-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/libc-lockP.h | 5 +---- sysdeps/htl/pthreadP.h | 1 - sysdeps/mach/hurd/htl/pt-mutexattr-init.c | 1 + sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libc.abilist | 1 + sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 447ec4722f..5d1f7af378 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -55,7 +55,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutexattr-destroy \ - pt-mutexattr-init \ pt-mutexattr-getprioceiling \ pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ @@ -201,6 +200,7 @@ routines := \ pt-condattr-setpshared \ pt-getschedparam \ pt-mutex-checklocked \ + pt-mutexattr-init \ pt-nthreads \ pt-pthread_self \ pt-self pt-equal \ diff --git a/htl/Versions b/htl/Versions index 1492a2a1ca..ae0e794919 100644 --- a/htl/Versions +++ b/htl/Versions @@ -38,6 +38,7 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_mutexattr_init; pthread_sigmask; } @@ -114,6 +115,7 @@ libc { __pthread_condattr_init; __pthread_default_condattr; __pthread_mutex_checklocked; + __pthread_mutexattr_init; __pthread_sigstate; __pthread_sigstate_destroy; __pthread_sigmask; @@ -176,7 +178,7 @@ libpthread { pthread_mutexattr_destroy; pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; - pthread_mutexattr_gettype; pthread_mutexattr_init; + pthread_mutexattr_gettype; pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 54ab845664..404bd9f05a 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -85,6 +85,7 @@ extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr); +libc_hidden_proto (__pthread_mutexattr_init) extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr); @@ -113,8 +114,6 @@ extern int __pthread_atfork (void (*__prepare) (void), void (*__parent) (void), void (*__child) (void)); - - /* Make the pthread functions weak so that we can elide them from single-threaded processes. */ #if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread) @@ -124,7 +123,6 @@ weak_extern (__pthread_mutex_destroy) weak_extern (__pthread_mutex_lock) weak_extern (__pthread_mutex_trylock) weak_extern (__pthread_mutex_unlock) -weak_extern (__pthread_mutexattr_init) weak_extern (__pthread_mutexattr_destroy) weak_extern (__pthread_mutexattr_settype) weak_extern (__pthread_rwlock_init) @@ -147,7 +145,6 @@ weak_extern (__pthread_setcancelstate) # pragma weak __pthread_mutex_lock # pragma weak __pthread_mutex_trylock # pragma weak __pthread_mutex_unlock -# pragma weak __pthread_mutexattr_init # pragma weak __pthread_mutexattr_destroy # pragma weak __pthread_mutexattr_settype # pragma weak __pthread_rwlock_destroy diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index fa47648a96..b32c41b1d0 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -38,7 +38,6 @@ extern int __pthread_mutex_trylock (pthread_mutex_t *_mutex); extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, const struct timespec *__abstime); extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); -extern int __pthread_mutexattr_init (pthread_mutexattr_t *attr); extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); extern int __pthread_cond_init (pthread_cond_t *cond, diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-init.c b/sysdeps/mach/hurd/htl/pt-mutexattr-init.c index e248f68f47..0464dcddca 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-init.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-init.c @@ -38,4 +38,5 @@ __pthread_mutexattr_init (pthread_mutexattr_t *attrp) *attrp = dfl_attr; return 0; } +hidden_def (__pthread_mutexattr_init) weak_alias (__pthread_mutexattr_init, pthread_mutexattr_init) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index b48fa38edf..9a11c29266 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -63,6 +63,7 @@ GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F +GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F GLIBC_2.12 pthread_sigmask F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index f90794bc5c..7e4c7ff6d0 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -55,7 +55,6 @@ GLIBC_2.12 pthread_mutexattr_getprioceiling F GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F -GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_mutexattr_setprioceiling F GLIBC_2.12 pthread_mutexattr_setprotocol F GLIBC_2.12 pthread_mutexattr_setpshared F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 1cd5f99297..191446e2f8 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1551,6 +1551,7 @@ GLIBC_2.38 pthread_mutex_destroy F GLIBC_2.38 pthread_mutex_init F GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F +GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcanceltype F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 6262dfa86c..26cb3e64e6 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -80,7 +80,6 @@ GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_gettype F -GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_mutexattr_setprioceiling F GLIBC_2.38 pthread_mutexattr_setprotocol F GLIBC_2.38 pthread_mutexattr_setpshared F From patchwork Thu Jan 2 00:56:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103859 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 93E87385782C for ; Thu, 2 Jan 2025 00:58:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93E87385782C 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 4AD983857B98 for ; Thu, 2 Jan 2025 00:56:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4AD983857B98 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 4AD983857B98 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=1735779389; cv=none; b=hYK0CQz7jWPBpsS/n2E3fH69wo9MkYz2+/ee27RaeiIHZ6lEe7fQgyZfwPsViSVoRjVgpLyd9F5RfzMZ+ZX1CbUjt/76sLQw9UCDQws2CZuULcWra9ymNUHiDj0+kS+ilkf0nlRUYKN7gK3h/ykJjhP+4Z21tx+Y6XVGVAIkFpY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779389; c=relaxed/simple; bh=lFoqtinPIrOA5MVbtOMLpYi6lRoV/oOMG0ZEWpftfgE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=nRryDz9YJ0qtBXt2NV+oqlFw+bcGpEU9bRkJgpGw+fgMlQg/Vmq1tJ38JXNUBmO7g8Zpe5CWOOlveuXsA8YaAF16PFQ9u9mc1H4dIvaicVuYUvgcVRCPlytLvtrVAc+baybrFt9UuVRuq19CfktOeue8ca15DPpGOHFiZgitmdk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4AD983857B98 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id EDA4CA03B6; Thu, 2 Jan 2025 01:56:27 +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 L7nEIpr2uNLG; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 9098DA03B7; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v1q-0UJZ; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited 2/8] htl: move pthread_mutexattr_destroy into libc. Date: Thu, 2 Jan 2025 01:56:20 +0100 Message-ID: <20250102005626.2364140-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, 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 Message-ID: <20241231134909.1166440-3-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/libc-lockP.h | 4 ++-- sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c | 2 +- sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libc.abilist | 1 + sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 5d1f7af378..e2b22af95f 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -54,7 +54,6 @@ libpthread-routines := \ pt-setcanceltype \ pt-testcancel \ pt-cancel \ - pt-mutexattr-destroy \ pt-mutexattr-getprioceiling \ pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ @@ -200,6 +199,7 @@ routines := \ pt-condattr-setpshared \ pt-getschedparam \ pt-mutex-checklocked \ + pt-mutexattr-destroy \ pt-mutexattr-init \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index ae0e794919..d3ee842ebc 100644 --- a/htl/Versions +++ b/htl/Versions @@ -38,6 +38,7 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_mutexattr_destroy; pthread_mutexattr_init; pthread_sigmask; } @@ -115,6 +116,7 @@ libc { __pthread_condattr_init; __pthread_default_condattr; __pthread_mutex_checklocked; + __pthread_mutexattr_destroy; __pthread_mutexattr_init; __pthread_sigstate; __pthread_sigstate_destroy; @@ -176,7 +178,7 @@ libpthread { pthread_mutex_timedlock; pthread_mutex_transfer_np; pthread_mutex_trylock; pthread_mutex_unlock; - pthread_mutexattr_destroy; pthread_mutexattr_getprioceiling; + pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 404bd9f05a..a3a53e8833 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -77,6 +77,7 @@ extern int __pthread_mutex_init (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutex_attr); extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); +libc_hidden_proto (__pthread_mutex_destroy) extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex); @@ -88,6 +89,7 @@ extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr); libc_hidden_proto (__pthread_mutexattr_init) extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr); +libc_hidden_proto (__pthread_mutexattr_destroy) extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind); @@ -123,7 +125,6 @@ weak_extern (__pthread_mutex_destroy) weak_extern (__pthread_mutex_lock) weak_extern (__pthread_mutex_trylock) weak_extern (__pthread_mutex_unlock) -weak_extern (__pthread_mutexattr_destroy) weak_extern (__pthread_mutexattr_settype) weak_extern (__pthread_rwlock_init) weak_extern (__pthread_rwlock_destroy) @@ -145,7 +146,6 @@ weak_extern (__pthread_setcancelstate) # pragma weak __pthread_mutex_lock # pragma weak __pthread_mutex_trylock # pragma weak __pthread_mutex_unlock -# pragma weak __pthread_mutexattr_destroy # pragma weak __pthread_mutexattr_settype # pragma weak __pthread_rwlock_destroy # pragma weak __pthread_rwlock_rdlock diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c b/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c index 47e74b4494..9d92a06c75 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-destroy.c @@ -29,5 +29,5 @@ __pthread_mutexattr_destroy (pthread_mutexattr_t *attrp) (void) attrp; return 0; } - +hidden_def (__pthread_mutexattr_destroy) weak_alias (__pthread_mutexattr_destroy, pthread_mutexattr_destroy) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 9a11c29266..69af145286 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -63,6 +63,7 @@ GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F +GLIBC_2.12 pthread_mutexattr_destroy F GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 7e4c7ff6d0..0fd3e53833 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -50,7 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F -GLIBC_2.12 pthread_mutexattr_destroy F GLIBC_2.12 pthread_mutexattr_getprioceiling F GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_getpshared F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 191446e2f8..52e698f818 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1551,6 +1551,7 @@ GLIBC_2.38 pthread_mutex_destroy F GLIBC_2.38 pthread_mutex_init F GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F +GLIBC_2.38 pthread_mutexattr_destroy F GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 26cb3e64e6..90ea26b2ca 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -73,7 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F -GLIBC_2.38 pthread_mutexattr_destroy F GLIBC_2.38 pthread_mutexattr_getprioceiling F GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_getpshared F From patchwork Thu Jan 2 00:56:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103858 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 EC6093857B98 for ; Thu, 2 Jan 2025 00:58:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC6093857B98 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 1A5A43857B8F for ; Thu, 2 Jan 2025 00:56:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1A5A43857B8F 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 1A5A43857B8F 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=1735779389; cv=none; b=F+hh/ZjXixW+cIeheBl84FesgX2bdkuwi6BRdQoZY+/w2d0bqjW25IqDVaGyzXoGDmXuanCTX6JH7FGyxwk4ptETgLkJdlTrP8kt4NZiJoWy/APtZdYYIKkURaf5lu9KV6vo4FHNjZxnTcZzNpu9/0w2XAj19wMV7CFdAF/LqEE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779389; c=relaxed/simple; bh=Rf1G1T8FzGI+9oHCaqVMafnnHyEjvHcJsryubOKq4no=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=UfU1R5brTL8lmkIPSxopQh5kcpkInsbgmacdQZdFO6U6ggbPFxslx9WjJ1YegZjAyRs5PB8r+rjAZxkW5dh7wSyWbCNv2niH+8X7uFefHcX887E0f7ftYGh4lef6tpre2U7m6fLC1Vatlh8L5ZEy48jnBOHkFaSr/XyafN2b1yI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A5A43857B8F Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 03E8CA03B7; Thu, 2 Jan 2025 01:56:28 +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 ZtYODDT3XS6S; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 95762A03DA; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v1t-0Z8c; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd, commited 3/8] htl: move pthread_mutexattr_getprotocol into libc. Date: Thu, 2 Jan 2025 01:56:21 +0100 Message-ID: <20250102005626.2364140-4-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 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 Message-ID: <20241231134909.1166440-4-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/pthreadP.h | 3 +++ sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c | 11 +++++++++-- 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, 20 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index e2b22af95f..c4c9dc08db 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -55,7 +55,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutexattr-getprioceiling \ - pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ pt-mutexattr-gettype \ pt-mutexattr-setprioceiling \ @@ -200,6 +199,7 @@ routines := \ pt-getschedparam \ pt-mutex-checklocked \ pt-mutexattr-destroy \ + pt-mutexattr-getprotocol \ pt-mutexattr-init \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index d3ee842ebc..61c3b9ac97 100644 --- a/htl/Versions +++ b/htl/Versions @@ -39,6 +39,7 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_destroy; + pthread_mutexattr_getprotocol; pthread_mutexattr_init; pthread_sigmask; } @@ -85,6 +86,7 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_mutexattr_getprotocol; pthread_sigmask; } @@ -179,7 +181,7 @@ libpthread { pthread_mutex_trylock; pthread_mutex_unlock; pthread_mutexattr_getprioceiling; - pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; + pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index b32c41b1d0..9798fcb8a5 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -40,6 +40,9 @@ extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); +extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, + int *__restrict __protocol); +libc_hidden_proto (__pthread_mutexattr_getprotocol) extern int __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr); libc_hidden_proto (__pthread_cond_init) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c index 7be7bbdae2..79aac54099 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getprotocol.c @@ -16,16 +16,23 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp) +__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attrp, int *ptp) { *ptp = attrp->__protocol; return 0; } +libc_hidden_def (__pthread_mutexattr_getprotocol) +versioned_symbol (libc, __pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_getprotocol,pthread_mutexattr_getprotocol, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 69af145286..4289853512 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -64,6 +64,7 @@ GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_mutexattr_destroy F +GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F @@ -2523,6 +2524,7 @@ GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F +GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_sigmask F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 0fd3e53833..b53ca95033 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -51,7 +51,6 @@ GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F GLIBC_2.12 pthread_mutexattr_getprioceiling F -GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_setprioceiling F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 52e698f818..667c96e7b2 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1552,6 +1552,7 @@ GLIBC_2.38 pthread_mutex_init F GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F +GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F @@ -2212,6 +2213,7 @@ GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F +GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_sigmask F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 90ea26b2ca..24becc5ab9 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -74,7 +74,6 @@ GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_getprioceiling F -GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F From patchwork Thu Jan 2 00:56:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103860 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 132EB3857B8F for ; Thu, 2 Jan 2025 00:59:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 132EB3857B8F 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 3CFC03857B90 for ; Thu, 2 Jan 2025 00:56:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3CFC03857B90 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 3CFC03857B90 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=1735779389; cv=none; b=o4v9i28NKvihjqdJLRaD+QQ5KYri5tdLopUeN+K1dtMkboZFS5Aff9WeoTz7KZouTPwrcmZ3REonhvWpx6Q2XlBW+sSVnF+0FlzS+4lPc7wOUaWs+ubFDFsQOT1LJVFfgwpHJ28SzI9LPPpdZoYo22V25osw1MZ7sBxjNKByqNk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779389; c=relaxed/simple; bh=VnvYRmfJAC81PAPYmre4kfgKHt7dnazolMfkD8awKo4=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=k7JhQ0ApKHyvGPo7n5qfuj0RQxp/rAXl/s6BSHDRsJ3YwcdDdlWYwsmu3WEVLehDRJGIVw90LFw1eh3B8ulM+xHBvBWLJKOw+CzhN3fk3+JmAlAtapig77ZPBqq4j9iFhU0sOgFpeviTOSO5AxK+3OWeDb6ljtWVaCI+RZZ8N9A= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3CFC03857B90 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 19EB4A03DA; Thu, 2 Jan 2025 01:56:28 +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 uKO6QNhAUZeW; Thu, 2 Jan 2025 01:56:28 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 9A7E4A218D; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v1w-0eBr; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd, commited 4/8] htl: move pthread_mutexattr_setprotocol into libc. Date: Thu, 2 Jan 2025 01:56:22 +0100 Message-ID: <20250102005626.2364140-5-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 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 Message-ID: <20241231134909.1166440-5-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/pthreadP.h | 4 ++++ sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c | 11 +++++++++-- 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, 21 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index c4c9dc08db..733a8e9db2 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -58,7 +58,6 @@ libpthread-routines := \ pt-mutexattr-getpshared \ pt-mutexattr-gettype \ pt-mutexattr-setprioceiling \ - pt-mutexattr-setprotocol \ pt-mutexattr-setpshared \ pt-mutexattr-settype \ pt-mutexattr-getrobust \ @@ -201,6 +200,7 @@ routines := \ pt-mutexattr-destroy \ pt-mutexattr-getprotocol \ pt-mutexattr-init \ + pt-mutexattr-setprotocol \ pt-nthreads \ pt-pthread_self \ pt-self pt-equal \ diff --git a/htl/Versions b/htl/Versions index 61c3b9ac97..c356590e72 100644 --- a/htl/Versions +++ b/htl/Versions @@ -41,6 +41,7 @@ libc { pthread_mutexattr_destroy; pthread_mutexattr_getprotocol; pthread_mutexattr_init; + pthread_mutexattr_setprotocol; pthread_sigmask; } @@ -87,6 +88,7 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_getprotocol; + pthread_mutexattr_setprotocol; pthread_sigmask; } @@ -183,7 +185,7 @@ libpthread { pthread_mutexattr_getprioceiling; pthread_mutexattr_getpshared; pthread_mutexattr_gettype; - pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; + pthread_mutexattr_setprioceiling; pthread_mutexattr_setpshared; pthread_mutexattr_settype; pthread_once; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 9798fcb8a5..1289c77473 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -43,6 +43,10 @@ extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, int *__restrict __protocol); libc_hidden_proto (__pthread_mutexattr_getprotocol) +extern int __pthread_mutexattr_setprotocol(pthread_mutexattr_t *__attr, + int __protocol); +libc_hidden_proto (__pthread_mutexattr_setprotocol) + extern int __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr); libc_hidden_proto (__pthread_cond_init) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c index 5a06ad47db..875ea22e1b 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprotocol.c @@ -16,15 +16,16 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) +__pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) { (void) attrp; return (proto == PTHREAD_PRIO_NONE @@ -32,3 +33,9 @@ pthread_mutexattr_setprotocol (pthread_mutexattr_t *attrp, int proto) : (proto != PTHREAD_PRIO_INHERIT && proto != PTHREAD_PRIO_PROTECT) ? EINVAL : ENOTSUP); } +libc_hidden_def (__pthread_mutexattr_setprotocol) +versioned_symbol (libc, __pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_setprotocol,pthread_mutexattr_setprotocol, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 4289853512..7f7c227900 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -66,6 +66,7 @@ GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_mutexattr_destroy F GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_init F +GLIBC_2.12 pthread_mutexattr_setprotocol F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F GLIBC_2.12 pthread_sigmask F @@ -2525,6 +2526,7 @@ GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F +GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_sigmask F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index b53ca95033..182909a988 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -54,7 +54,6 @@ GLIBC_2.12 pthread_mutexattr_getprioceiling F GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_setprioceiling F -GLIBC_2.12 pthread_mutexattr_setprotocol F GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_once F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 667c96e7b2..1e83c9f1b4 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1554,6 +1554,7 @@ GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_init F +GLIBC_2.38 pthread_mutexattr_setprotocol F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcanceltype F @@ -2214,6 +2215,7 @@ GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F +GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_sigmask F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 24becc5ab9..85a08b872f 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -79,7 +79,6 @@ GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_setprioceiling F -GLIBC_2.38 pthread_mutexattr_setprotocol F GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_setrobust F GLIBC_2.38 pthread_mutexattr_setrobust_np F From patchwork Thu Jan 2 00:56:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103864 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 ADA303857BB9 for ; Thu, 2 Jan 2025 01:01:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org ADA303857BB9 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 9E9503857C6C for ; Thu, 2 Jan 2025 00:56:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9E9503857C6C 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 9E9503857C6C 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=1735779396; cv=none; b=mW1wvnouQHmKLv1DK0l9M+gZSefmdUyttjeG9LKdjEzS796IBVgdWeM6jDcu9R3LFIZdvV7Jz87fsDzC9EVkMV/Gt4e/ReJGBiH6Xdn45CuQ3AKmT5G0UQ5u90KSKKmd2tF/1+gaEpy5dqiMJpVt1KZRkVEH4nZHDP2HEAohAq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779396; c=relaxed/simple; bh=kx7+x/HmcQfbyHmJ7z+PPEX8HwGrS+wsh8UhbYGIQCo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=JFj5flf9Sp9qZYnm/sBmBAYRm7wUSQaPQue5fXljxWIm3BIZlq4gz4a3HDojipx/EfFTaKV7vQB0VWcgQ9HaAOehQeaAfgJ5q1zpbUZQGVcnMOBW6rOP5GfrRQFC7W9GTtXwia//fdSlgmEATIVkqxZXYZEg0TJjW3UvBRUxD4Q= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9E9503857C6C Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 2873CA218D; Thu, 2 Jan 2025 01:56:28 +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 592K1ABtgUbA; Thu, 2 Jan 2025 01:56:28 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 9E0DCA477B; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v20-0jut; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd, commited 5/8] htl: move pthread_mutexattr_settype, pthread_mutexattr_gettype into libc. Date: Thu, 2 Jan 2025 01:56:23 +0100 Message-ID: <20250102005626.2364140-6-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 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 Message-ID: <20241231134909.1166440-6-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 8 ++++++-- sysdeps/htl/pthreadP.h | 7 +++++++ sysdeps/mach/hurd/htl/pt-mutexattr-gettype.c | 11 +++++++++-- sysdeps/mach/hurd/htl/pt-mutexattr-settype.c | 8 +++++++- sysdeps/mach/hurd/i386/libc.abilist | 3 +++ sysdeps/mach/hurd/i386/libpthread.abilist | 2 -- sysdeps/mach/hurd/x86_64/libc.abilist | 3 +++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 2 -- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 733a8e9db2..a6c51b61f0 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -56,10 +56,8 @@ libpthread-routines := \ pt-cancel \ pt-mutexattr-getprioceiling \ pt-mutexattr-getpshared \ - pt-mutexattr-gettype \ pt-mutexattr-setprioceiling \ pt-mutexattr-setpshared \ - pt-mutexattr-settype \ pt-mutexattr-getrobust \ pt-mutexattr-setrobust \ pt-mutex-init \ @@ -199,8 +197,10 @@ routines := \ pt-mutex-checklocked \ pt-mutexattr-destroy \ pt-mutexattr-getprotocol \ + pt-mutexattr-gettype \ pt-mutexattr-init \ pt-mutexattr-setprotocol \ + pt-mutexattr-settype \ pt-nthreads \ pt-pthread_self \ pt-self pt-equal \ diff --git a/htl/Versions b/htl/Versions index c356590e72..ca52bd11d6 100644 --- a/htl/Versions +++ b/htl/Versions @@ -40,8 +40,10 @@ libc { pthread_condattr_setpshared; pthread_mutexattr_destroy; pthread_mutexattr_getprotocol; + pthread_mutexattr_gettype; pthread_mutexattr_init; pthread_mutexattr_setprotocol; + pthread_mutexattr_settype; pthread_sigmask; } @@ -88,7 +90,9 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_getprotocol; + pthread_mutexattr_gettype; pthread_mutexattr_setprotocol; + pthread_mutexattr_settype; pthread_sigmask; } @@ -122,6 +126,7 @@ libc { __pthread_mutex_checklocked; __pthread_mutexattr_destroy; __pthread_mutexattr_init; + __pthread_mutexattr_settype; __pthread_sigstate; __pthread_sigstate_destroy; __pthread_sigmask; @@ -184,9 +189,8 @@ libpthread { pthread_mutexattr_getprioceiling; pthread_mutexattr_getpshared; - pthread_mutexattr_gettype; pthread_mutexattr_setprioceiling; - pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_mutexattr_setpshared; pthread_once; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 1289c77473..554d77a8aa 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -47,6 +47,13 @@ extern int __pthread_mutexattr_setprotocol(pthread_mutexattr_t *__attr, int __protocol); libc_hidden_proto (__pthread_mutexattr_setprotocol) +extern int __pthread_mutexattr_gettype(const pthread_mutexattr_t *__restrict __attr, + int *__restrict __type); +libc_hidden_proto (__pthread_mutexattr_gettype) +extern int __pthread_mutexattr_settype(pthread_mutexattr_t *__attr, + int __type); +libc_hidden_proto (__pthread_mutexattr_settype) + extern int __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr); libc_hidden_proto (__pthread_cond_init) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-gettype.c b/sysdeps/mach/hurd/htl/pt-mutexattr-gettype.c index 321f7fbd2a..b554bc4bb7 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-gettype.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-gettype.c @@ -16,16 +16,23 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_gettype (const pthread_mutexattr_t *attrp, int *outp) +__pthread_mutexattr_gettype (const pthread_mutexattr_t *attrp, int *outp) { *outp = attrp->__mutex_type; return 0; } +libc_hidden_def (__pthread_mutexattr_gettype) +versioned_symbol (libc, __pthread_mutexattr_gettype, pthread_mutexattr_gettype, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_gettype,pthread_mutexattr_gettype, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-settype.c b/sysdeps/mach/hurd/htl/pt-mutexattr-settype.c index 5499e71a20..84aeaeee50 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-settype.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-settype.c @@ -22,6 +22,7 @@ #include #include "pt-mutex.h" #include +#include int __pthread_mutexattr_settype (pthread_mutexattr_t *attrp, int type) @@ -32,4 +33,9 @@ __pthread_mutexattr_settype (pthread_mutexattr_t *attrp, int type) attrp->__mutex_type = type; return 0; } -weak_alias (__pthread_mutexattr_settype, pthread_mutexattr_settype) +libc_hidden_def (__pthread_mutexattr_settype) +versioned_symbol (libc, __pthread_mutexattr_settype, pthread_mutexattr_settype, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_settype,pthread_mutexattr_settype, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 7f7c227900..5ede5a29a3 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -65,8 +65,10 @@ GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_mutexattr_destroy F GLIBC_2.12 pthread_mutexattr_getprotocol F +GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_mutexattr_setprotocol F +GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F GLIBC_2.12 pthread_sigmask F @@ -2526,6 +2528,7 @@ GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F +GLIBC_2.41 pthread_mutexattr_gettype F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_sigmask F GLIBC_2.5 __readlinkat_chk F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 182909a988..0ba4f8e9f9 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -52,10 +52,8 @@ GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F GLIBC_2.12 pthread_mutexattr_getprioceiling F GLIBC_2.12 pthread_mutexattr_getpshared F -GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_setprioceiling F GLIBC_2.12 pthread_mutexattr_setpshared F -GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_once F GLIBC_2.12 pthread_rwlock_destroy F GLIBC_2.12 pthread_rwlock_init F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 1e83c9f1b4..4bff3073a9 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1553,8 +1553,10 @@ GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F GLIBC_2.38 pthread_mutexattr_getprotocol F +GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_mutexattr_setprotocol F +GLIBC_2.38 pthread_mutexattr_settype F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcanceltype F @@ -2215,6 +2217,7 @@ GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F +GLIBC_2.41 pthread_mutexattr_gettype F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_sigmask F HURD_CTHREADS_0.3 __cthread_getspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 85a08b872f..bd8a03634b 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -77,12 +77,10 @@ GLIBC_2.38 pthread_mutexattr_getprioceiling F GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F -GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_setprioceiling F GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_setrobust F GLIBC_2.38 pthread_mutexattr_setrobust_np F -GLIBC_2.38 pthread_mutexattr_settype F GLIBC_2.38 pthread_once F GLIBC_2.38 pthread_rwlock_clockrdlock F GLIBC_2.38 pthread_rwlock_clockwrlock F From patchwork Thu Jan 2 00:56:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103862 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 37EFC3857C6C for ; Thu, 2 Jan 2025 00:59:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 37EFC3857C6C 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 98C733857C5F for ; Thu, 2 Jan 2025 00:56:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 98C733857C5F 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 98C733857C5F 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=1735779396; cv=none; b=WTMx0o/Kvwt2VtXbu/jmAH5wM5pLw3JbXyJoOb3M35nakWIBagCH0bPsLuD6ZK5szeBKHTeACnt4BzlRQz2NcYgL0oGapIxW2KxA+VvF1eXTdvlHR3CGVXcGgB/m092aLc1ylZQLMP3NhbIV2YTDXre1oN0GAC+Wz2TYAH8c9k0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779396; c=relaxed/simple; bh=8CbDn85u0fzGGzb1WefkeYIa80DBMM+O0kshgZH8Buk=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=tWkggs1OFjmq7jCo90wi0/kttDSxetcpadeCouug3Kw8H+wrFTS+vL0822YFwlSKTvKttEdLnLTfudX/PXsld5DYVZDN+XdUftRhePDSIYfMSuR8VRvH6Cjt0gC4tri+4N1TJwGBkOpkmT4XQVeF+scQjyPfSMcLkzc0LnIuvoo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 98C733857C5F Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 4001EA477B; Thu, 2 Jan 2025 01:56:28 +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 uXvrJJQtobWp; Thu, 2 Jan 2025 01:56:28 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 A7D70A4909; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v23-0ohV; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd, commited 6/8] htl: move pthread_mutexattr_setpshared, pthread_mutexattr_getpshared into libc. Date: Thu, 2 Jan 2025 01:56:24 +0100 Message-ID: <20250102005626.2364140-7-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TVD_SPACE_RATIO, 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 Message-ID: <20241231134909.1166440-7-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 6 ++++-- sysdeps/htl/pthreadP.h | 6 ++++++ sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c | 11 +++++++++-- sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c | 12 ++++++++++-- sysdeps/mach/hurd/i386/libc.abilist | 5 +++++ sysdeps/mach/hurd/i386/libpthread.abilist | 2 -- sysdeps/mach/hurd/x86_64/libc.abilist | 5 +++++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 2 -- 9 files changed, 41 insertions(+), 12 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index a6c51b61f0..ed2c32e2be 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -55,9 +55,7 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutexattr-getprioceiling \ - pt-mutexattr-getpshared \ pt-mutexattr-setprioceiling \ - pt-mutexattr-setpshared \ pt-mutexattr-getrobust \ pt-mutexattr-setrobust \ pt-mutex-init \ @@ -197,9 +195,11 @@ routines := \ pt-mutex-checklocked \ pt-mutexattr-destroy \ pt-mutexattr-getprotocol \ + pt-mutexattr-getpshared \ pt-mutexattr-gettype \ pt-mutexattr-init \ pt-mutexattr-setprotocol \ + pt-mutexattr-setpshared \ pt-mutexattr-settype \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index ca52bd11d6..cb308820e3 100644 --- a/htl/Versions +++ b/htl/Versions @@ -40,9 +40,11 @@ libc { pthread_condattr_setpshared; pthread_mutexattr_destroy; pthread_mutexattr_getprotocol; + pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_init; pthread_mutexattr_setprotocol; + pthread_mutexattr_setpshared; pthread_mutexattr_settype; pthread_sigmask; } @@ -90,8 +92,10 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_getprotocol; + pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_setprotocol; + pthread_mutexattr_setpshared; pthread_mutexattr_settype; pthread_sigmask; } @@ -188,9 +192,7 @@ libpthread { pthread_mutex_trylock; pthread_mutex_unlock; pthread_mutexattr_getprioceiling; - pthread_mutexattr_getpshared; pthread_mutexattr_setprioceiling; - pthread_mutexattr_setpshared; pthread_once; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 554d77a8aa..b5ff56227b 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -39,6 +39,12 @@ extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex, const struct timespec *__abstime); extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind); +extern int __pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict __attr, + int *__restrict __pshared); +libc_hidden_proto (__pthread_mutexattr_getpshared) +extern int __pthread_mutexattr_setpshared(pthread_mutexattr_t *__attr, + int __pshared); +libc_hidden_proto (__pthread_mutexattr_setpshared) extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, int *__restrict __protocol); diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c index 6a69ca81a7..bf3588810c 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c @@ -16,16 +16,23 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_getpshared (const pthread_mutexattr_t *attrp, int *outp) +__pthread_mutexattr_getpshared (const pthread_mutexattr_t *attrp, int *outp) { *outp = attrp->__pshared; return 0; } +libc_hidden_def (__pthread_mutexattr_getpshared) +versioned_symbol (libc, __pthread_mutexattr_getpshared, pthread_mutexattr_getpshared, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_getpshared,pthread_mutexattr_getpshared, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c index e1480e1439..16b1099014 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c @@ -16,15 +16,16 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared) +__pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared) { if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED) return EINVAL; @@ -32,3 +33,10 @@ pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared) attrp->__pshared = pshared; return 0; } + +libc_hidden_def (__pthread_mutexattr_setpshared) +versioned_symbol (libc, __pthread_mutexattr_setpshared, pthread_mutexattr_setpshared, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_setpshared,pthread_mutexattr_setpshared, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 5ede5a29a3..45147cae6f 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -65,9 +65,11 @@ GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_mutexattr_destroy F GLIBC_2.12 pthread_mutexattr_getprotocol F +GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_init F GLIBC_2.12 pthread_mutexattr_setprotocol F +GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setschedparam F @@ -2528,8 +2530,11 @@ GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F +GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_gettype F GLIBC_2.41 pthread_mutexattr_setprotocol F +GLIBC_2.41 pthread_mutexattr_setpshared F +GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_sigmask F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 0ba4f8e9f9..cf6b71a00f 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -51,9 +51,7 @@ GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F GLIBC_2.12 pthread_mutexattr_getprioceiling F -GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_setprioceiling F -GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_once F GLIBC_2.12 pthread_rwlock_destroy F GLIBC_2.12 pthread_rwlock_init F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 4bff3073a9..0e9ff2db96 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1553,9 +1553,11 @@ GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F GLIBC_2.38 pthread_mutexattr_getprotocol F +GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_mutexattr_setprotocol F +GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_settype F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F @@ -2217,8 +2219,11 @@ GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F +GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_gettype F GLIBC_2.41 pthread_mutexattr_setprotocol F +GLIBC_2.41 pthread_mutexattr_setpshared F +GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_sigmask F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index bd8a03634b..866890caa6 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -74,11 +74,9 @@ GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_getprioceiling F -GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_setprioceiling F -GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_setrobust F GLIBC_2.38 pthread_mutexattr_setrobust_np F GLIBC_2.38 pthread_once F From patchwork Thu Jan 2 00:56:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103861 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 A87563857829 for ; Thu, 2 Jan 2025 00:59:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A87563857829 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 C8E6F3857B9F for ; Thu, 2 Jan 2025 00:56:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C8E6F3857B9F 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 C8E6F3857B9F 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=1735779397; cv=none; b=l/9jeeUj0opSdX1xqWVYgyGHAtuRbwfK2gvfruseRuVd4A41XIhlTXFzF/9gc4VwAsfcaVAmLp2yDjyLorDbt8xqBDG/T9Dqdr9bVcFUibtK6AhfB8EVDOYpdQNyEbcXQfr3iwrdt2HGIeOlIWqmSDARCzRkByfdpz5Hz1inOQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779397; c=relaxed/simple; bh=Fb7KddvP0IOxSudyT4vQyZTcCq/Xa7Afz+AX8m+Y2Pw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=e4SXF9ZR3BwBTBApvh+wG1WthoQ7rF376m/Rd14TG3zW3CE1eSoSQaplCVJyEYCdyw+6fLwYxuPF4GSkxN6e18EoWliw+iUtn6w55EYwDvTzYHnQdg+Q09V1Xp7Y8xiP3qPIyJcBCSeicJUN3g0sRvp6CP+Px9rbJ4JQkBKKQI8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8E6F3857B9F Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 4F2D4A4909; Thu, 2 Jan 2025 01:56:28 +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 co-pKBVWKBAj; Thu, 2 Jan 2025 01:56:28 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 A8F2DA490D; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v26-0tRb; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd, commited 7/8] htl: move pthread_mutexattr_{setrobust, setrobust_np}, pthread_mutexattr_{getrobust, getrobust_np} into libc. Date: Thu, 2 Jan 2025 01:56:25 +0100 Message-ID: <20250102005626.2364140-8-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-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 Message-ID: <20241231134909.1166440-8-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 8 +++++--- sysdeps/htl/pthreadP.h | 16 ++++++++++++++++ sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c | 13 ++++++++++--- sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c | 13 ++++++++++--- sysdeps/mach/hurd/i386/libc.abilist | 8 ++++++++ sysdeps/mach/hurd/i386/libpthread.abilist | 4 ---- sysdeps/mach/hurd/x86_64/libc.abilist | 8 ++++++++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 4 ---- 9 files changed, 59 insertions(+), 19 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index ed2c32e2be..a46dcff204 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -56,8 +56,6 @@ libpthread-routines := \ pt-cancel \ pt-mutexattr-getprioceiling \ pt-mutexattr-setprioceiling \ - pt-mutexattr-getrobust \ - pt-mutexattr-setrobust \ pt-mutex-init \ pt-mutex-destroy \ pt-mutex-lock \ @@ -196,10 +194,12 @@ routines := \ pt-mutexattr-destroy \ pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ + pt-mutexattr-getrobust \ pt-mutexattr-gettype \ pt-mutexattr-init \ pt-mutexattr-setprotocol \ pt-mutexattr-setpshared \ + pt-mutexattr-setrobust \ pt-mutexattr-settype \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index cb308820e3..42e3ebebf0 100644 --- a/htl/Versions +++ b/htl/Versions @@ -76,6 +76,9 @@ libc { thrd_current; thrd_equal; thrd_sleep; thrd_yield; pthread_cond_clockwait; + + pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; + pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; } GLIBC_2.41 { @@ -93,9 +96,11 @@ libc { pthread_condattr_setpshared; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; + pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; pthread_mutexattr_gettype; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; + pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; pthread_mutexattr_settype; pthread_sigmask; } @@ -233,9 +238,6 @@ libpthread { cnd_broadcast; cnd_destroy; cnd_init; cnd_signal; cnd_timedwait; cnd_wait; tss_create; tss_delete; tss_get; tss_set; - pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; - pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; - pthread_mutex_consistent; pthread_mutex_consistent_np; pthread_mutex_clocklock; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index b5ff56227b..d08a0ca7dd 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -46,6 +46,22 @@ extern int __pthread_mutexattr_setpshared(pthread_mutexattr_t *__attr, int __pshared); libc_hidden_proto (__pthread_mutexattr_setpshared) +/* Get the robustness flag of the mutex attribute ATTR. */ +extern int __pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr, + int *__robustness); +libc_hidden_proto (__pthread_mutexattr_getrobust) +extern int __pthread_mutexattr_getrobust_np (const pthread_mutexattr_t *__attr, + int *__robustness); +libc_hidden_proto (__pthread_mutexattr_getrobust_np) +extern int __pthread_mutexattr_setrobust_np (pthread_mutexattr_t *__attr, + int __robustness); +libc_hidden_proto (__pthread_mutexattr_setrobust_np) + +/* Set the robustness flag of the mutex attribute ATTR. */ +extern int __pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr, + int __robustness); +libc_hidden_proto (__pthread_mutexattr_setrobust) + extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, int *__restrict __protocol); libc_hidden_proto (__pthread_mutexattr_getprotocol) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c index fa14b88dfc..6915ac79d6 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getrobust.c @@ -16,19 +16,26 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_getrobust (const pthread_mutexattr_t *attrp, int *outp) +__pthread_mutexattr_getrobust (const pthread_mutexattr_t *attrp, int *outp) { *outp = ((attrp->__prioceiling & PTHREAD_MUTEX_ROBUST) ? PTHREAD_MUTEX_ROBUST : PTHREAD_MUTEX_STALLED); return 0; } +libc_hidden_def (__pthread_mutexattr_getrobust) +versioned_symbol (libc, __pthread_mutexattr_getrobust, pthread_mutexattr_getrobust, GLIBC_2_41); +versioned_symbol (libc, __pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np, GLIBC_2_41); -weak_alias (pthread_mutexattr_getrobust, pthread_mutexattr_getrobust_np) +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_32, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_getrobust,pthread_mutexattr_getrobust, GLIBC_2_32); +compat_symbol (libpthread, __pthread_mutexattr_getrobust,pthread_mutexattr_getrobust_np, GLIBC_2_32); +#endif diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c index 6bba0df68b..8d90814174 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setrobust.c @@ -16,15 +16,16 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_setrobust (pthread_mutexattr_t *attrp, int robust) +__pthread_mutexattr_setrobust (pthread_mutexattr_t *attrp, int robust) { if (robust != PTHREAD_MUTEX_ROBUST && robust != PTHREAD_MUTEX_STALLED) return EINVAL; @@ -32,5 +33,11 @@ pthread_mutexattr_setrobust (pthread_mutexattr_t *attrp, int robust) attrp->__prioceiling |= robust; return 0; } +libc_hidden_def (__pthread_mutexattr_setrobust) +versioned_symbol (libc, __pthread_mutexattr_setrobust, pthread_mutexattr_setrobust, GLIBC_2_41); +versioned_symbol (libc, __pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np, GLIBC_2_41); -weak_alias (pthread_mutexattr_setrobust, pthread_mutexattr_setrobust_np) +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_32, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_setrobust,pthread_mutexattr_setrobust, GLIBC_2_32); +compat_symbol (libpthread, __pthread_mutexattr_setrobust,pthread_mutexattr_setrobust_np, GLIBC_2_32); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 45147cae6f..8e364b14c6 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -2261,6 +2261,10 @@ GLIBC_2.32 __libc_single_threaded D 0x1 GLIBC_2.32 mach_print F GLIBC_2.32 mremap F GLIBC_2.32 pthread_cond_clockwait F +GLIBC_2.32 pthread_mutexattr_getrobust F +GLIBC_2.32 pthread_mutexattr_getrobust_np F +GLIBC_2.32 pthread_mutexattr_setrobust F +GLIBC_2.32 pthread_mutexattr_setrobust_np F GLIBC_2.32 sigabbrev_np F GLIBC_2.32 sigdescr_np F GLIBC_2.32 strerrordesc_np F @@ -2531,9 +2535,13 @@ GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_mutexattr_getpshared F +GLIBC_2.41 pthread_mutexattr_getrobust F +GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_gettype F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_mutexattr_setpshared F +GLIBC_2.41 pthread_mutexattr_setrobust F +GLIBC_2.41 pthread_mutexattr_setrobust_np F GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_sigmask F GLIBC_2.5 __readlinkat_chk F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index cf6b71a00f..bc48c0023d 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -112,10 +112,6 @@ GLIBC_2.32 pthread_clockjoin_np F GLIBC_2.32 pthread_mutex_clocklock F GLIBC_2.32 pthread_mutex_consistent F GLIBC_2.32 pthread_mutex_consistent_np F -GLIBC_2.32 pthread_mutexattr_getrobust F -GLIBC_2.32 pthread_mutexattr_getrobust_np F -GLIBC_2.32 pthread_mutexattr_setrobust F -GLIBC_2.32 pthread_mutexattr_setrobust_np F GLIBC_2.32 pthread_rwlock_clockrdlock F GLIBC_2.32 pthread_rwlock_clockwrlock F GLIBC_2.32 pthread_timedjoin_np F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 0e9ff2db96..05a4a8cf28 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1554,10 +1554,14 @@ GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_getpshared F +GLIBC_2.38 pthread_mutexattr_getrobust F +GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_init F GLIBC_2.38 pthread_mutexattr_setprotocol F GLIBC_2.38 pthread_mutexattr_setpshared F +GLIBC_2.38 pthread_mutexattr_setrobust F +GLIBC_2.38 pthread_mutexattr_setrobust_np F GLIBC_2.38 pthread_mutexattr_settype F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F @@ -2220,9 +2224,13 @@ GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_mutexattr_getpshared F +GLIBC_2.41 pthread_mutexattr_getrobust F +GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_gettype F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_mutexattr_setpshared F +GLIBC_2.41 pthread_mutexattr_setrobust F +GLIBC_2.41 pthread_mutexattr_setrobust_np F GLIBC_2.41 pthread_mutexattr_settype F GLIBC_2.41 pthread_sigmask F HURD_CTHREADS_0.3 __cthread_getspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 866890caa6..b382b4843a 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -74,11 +74,7 @@ GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_getprioceiling F -GLIBC_2.38 pthread_mutexattr_getrobust F -GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_setprioceiling F -GLIBC_2.38 pthread_mutexattr_setrobust F -GLIBC_2.38 pthread_mutexattr_setrobust_np F GLIBC_2.38 pthread_once F GLIBC_2.38 pthread_rwlock_clockrdlock F GLIBC_2.38 pthread_rwlock_clockwrlock F From patchwork Thu Jan 2 00:56:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 103863 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 70C2A3857BB0 for ; Thu, 2 Jan 2025 01:01:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 70C2A3857BB0 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 C8BFA3857B9E for ; Thu, 2 Jan 2025 00:56:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C8BFA3857B9E 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 C8BFA3857B9E 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=1735779397; cv=none; b=UusgTBVkJNb7ucN7MXcMULPTObZjIv8DgkYTC6pVK/5eljcpqonOBzayFwhroq1+B6rhBYzSZ29wuwjoKQTBvjYGxzfs0N/cCwpHM/X0hVln70G/N8uRlgbLQYB691ge7zcVqkCbgfVIRrQ7LkARBlSOd9Gax1V6FyvuaNIn0+M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735779397; c=relaxed/simple; bh=mgX2RurLdwe7coWtbROV9UFKF2RvPUUVrl6FoE7lqWo=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=jWyBwoStKplk11zNvglBXmltiBGj1qzCPgQo8KlpyoJJHWD8JvqSH6ySYgkY2LONoGIS4Otziscp3L2ppwNsjeald6I/+iD6HxZpHviowAYiYZt/yhfd9EV82GHGEYbq4VKjTQCCazRaN9JFiVIo3oMdW/+dWUzzYGhuAsqOlU0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C8BFA3857B9E Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 61A78A490D; Thu, 2 Jan 2025 01:56:28 +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 3q9uyjTVbCQo; Thu, 2 Jan 2025 01:56:28 +0100 (CET) Received: from begin.home (aaubervilliers-652-1-289-58.w82-121.abo.wanadoo.fr [82.121.86.58]) (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 B4A8FA4917; Thu, 2 Jan 2025 01:56:27 +0100 (CET) Received: from samy by begin.home with local (Exim 4.98) (envelope-from ) id 1tT9Vj-00000009v2A-0z6F; Thu, 02 Jan 2025 01:56:27 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd, commited 8/8] htl: move pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling into libc. Date: Thu, 2 Jan 2025 01:56:26 +0100 Message-ID: <20250102005626.2364140-9-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> References: <20250102005626.2364140-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TVD_SPACE_RATIO, 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 Message-ID: <20241231134909.1166440-9-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 7 ++++--- sysdeps/htl/pthreadP.h | 7 +++++++ sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c | 10 ++++++++-- sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c | 10 ++++++++-- sysdeps/mach/hurd/i386/libc.abilist | 4 ++++ sysdeps/mach/hurd/i386/libpthread.abilist | 2 -- sysdeps/mach/hurd/x86_64/libc.abilist | 4 ++++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 2 -- 9 files changed, 37 insertions(+), 13 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index a46dcff204..551d4c01d3 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -54,8 +54,6 @@ libpthread-routines := \ pt-setcanceltype \ pt-testcancel \ pt-cancel \ - pt-mutexattr-getprioceiling \ - pt-mutexattr-setprioceiling \ pt-mutex-init \ pt-mutex-destroy \ pt-mutex-lock \ @@ -192,11 +190,13 @@ routines := \ pt-getschedparam \ pt-mutex-checklocked \ pt-mutexattr-destroy \ + pt-mutexattr-getprioceiling \ pt-mutexattr-getprotocol \ pt-mutexattr-getpshared \ pt-mutexattr-getrobust \ pt-mutexattr-gettype \ pt-mutexattr-init \ + pt-mutexattr-setprioceiling \ pt-mutexattr-setprotocol \ pt-mutexattr-setpshared \ pt-mutexattr-setrobust \ diff --git a/htl/Versions b/htl/Versions index 42e3ebebf0..f1393ebe34 100644 --- a/htl/Versions +++ b/htl/Versions @@ -39,10 +39,12 @@ libc { pthread_condattr_setclock; pthread_condattr_setpshared; pthread_mutexattr_destroy; + pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; pthread_mutexattr_gettype; pthread_mutexattr_init; + pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; @@ -94,10 +96,12 @@ libc { pthread_condattr_getpshared; pthread_condattr_setclock; pthread_condattr_setpshared; + pthread_mutexattr_getprioceiling; pthread_mutexattr_getprotocol; pthread_mutexattr_getpshared; pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; pthread_mutexattr_gettype; + pthread_mutexattr_setprioceiling; pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; @@ -196,9 +200,6 @@ libpthread { pthread_mutex_timedlock; pthread_mutex_transfer_np; pthread_mutex_trylock; pthread_mutex_unlock; - pthread_mutexattr_getprioceiling; - pthread_mutexattr_setprioceiling; - pthread_once; pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index d08a0ca7dd..20dd5a1cc5 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -62,6 +62,13 @@ extern int __pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr, int __robustness); libc_hidden_proto (__pthread_mutexattr_setrobust) +extern int __pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *__restrict __attr, + int *__restrict __prioceiling); +libc_hidden_proto (__pthread_mutexattr_getprioceiling) +extern int __pthread_mutexattr_setprioceiling(pthread_mutexattr_t *__attr, + int __prioceiling); +libc_hidden_proto (__pthread_mutexattr_setprioceiling) + extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr, int *__restrict __protocol); libc_hidden_proto (__pthread_mutexattr_getprotocol) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c index 8848287a45..cb46251868 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c @@ -16,19 +16,25 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp) +__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp) { (void) ap; (void) clp; return ENOSYS; } +libc_hidden_def (__pthread_mutexattr_getprioceiling) +versioned_symbol (libc, __pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling, GLIBC_2_41); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_getprioceiling,pthread_mutexattr_getprioceiling, GLIBC_2_12); +#endif stub_warning (pthread_mutexattr_getprioceiling) diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c index a15593ac1b..8515235d88 100644 --- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c +++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c @@ -16,19 +16,25 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include #include #include #include "pt-mutex.h" #include +#include int -pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl) +__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl) { (void) attrp; (void) cl; return ENOSYS; } +libc_hidden_def (__pthread_mutexattr_setprioceiling) +versioned_symbol (libc, __pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling, GLIBC_2_41); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling, GLIBC_2_12); +#endif stub_warning (pthread_mutexattr_setprioceiling) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 8e364b14c6..40f35ee047 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -64,10 +64,12 @@ GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_mutexattr_destroy F +GLIBC_2.12 pthread_mutexattr_getprioceiling F GLIBC_2.12 pthread_mutexattr_getprotocol F GLIBC_2.12 pthread_mutexattr_getpshared F GLIBC_2.12 pthread_mutexattr_gettype F GLIBC_2.12 pthread_mutexattr_init F +GLIBC_2.12 pthread_mutexattr_setprioceiling F GLIBC_2.12 pthread_mutexattr_setprotocol F GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_settype F @@ -2533,11 +2535,13 @@ GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F +GLIBC_2.41 pthread_mutexattr_getprioceiling F GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_getrobust F GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_gettype F +GLIBC_2.41 pthread_mutexattr_setprioceiling F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_mutexattr_setpshared F GLIBC_2.41 pthread_mutexattr_setrobust F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index bc48c0023d..b925871a0b 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -50,8 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_mutex_trylock F GLIBC_2.12 pthread_mutex_unlock F -GLIBC_2.12 pthread_mutexattr_getprioceiling F -GLIBC_2.12 pthread_mutexattr_setprioceiling F GLIBC_2.12 pthread_once F GLIBC_2.12 pthread_rwlock_destroy F GLIBC_2.12 pthread_rwlock_init F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 05a4a8cf28..aaf55cbaf4 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1552,12 +1552,14 @@ GLIBC_2.38 pthread_mutex_init F GLIBC_2.38 pthread_mutex_lock F GLIBC_2.38 pthread_mutex_unlock F GLIBC_2.38 pthread_mutexattr_destroy F +GLIBC_2.38 pthread_mutexattr_getprioceiling F GLIBC_2.38 pthread_mutexattr_getprotocol F GLIBC_2.38 pthread_mutexattr_getpshared F GLIBC_2.38 pthread_mutexattr_getrobust F GLIBC_2.38 pthread_mutexattr_getrobust_np F GLIBC_2.38 pthread_mutexattr_gettype F GLIBC_2.38 pthread_mutexattr_init F +GLIBC_2.38 pthread_mutexattr_setprioceiling F GLIBC_2.38 pthread_mutexattr_setprotocol F GLIBC_2.38 pthread_mutexattr_setpshared F GLIBC_2.38 pthread_mutexattr_setrobust F @@ -2222,11 +2224,13 @@ GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F GLIBC_2.41 pthread_condattr_setpshared F +GLIBC_2.41 pthread_mutexattr_getprioceiling F GLIBC_2.41 pthread_mutexattr_getprotocol F GLIBC_2.41 pthread_mutexattr_getpshared F GLIBC_2.41 pthread_mutexattr_getrobust F GLIBC_2.41 pthread_mutexattr_getrobust_np F GLIBC_2.41 pthread_mutexattr_gettype F +GLIBC_2.41 pthread_mutexattr_setprioceiling F GLIBC_2.41 pthread_mutexattr_setprotocol F GLIBC_2.41 pthread_mutexattr_setpshared F GLIBC_2.41 pthread_mutexattr_setrobust F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index b382b4843a..608901fb00 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -73,8 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_mutex_trylock F GLIBC_2.38 pthread_mutex_unlock F -GLIBC_2.38 pthread_mutexattr_getprioceiling F -GLIBC_2.38 pthread_mutexattr_setprioceiling F GLIBC_2.38 pthread_once F GLIBC_2.38 pthread_rwlock_clockrdlock F GLIBC_2.38 pthread_rwlock_clockwrlock F