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