From patchwork Tue Dec 31 13:49:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 103800 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 3B65A3858D35 for ; Tue, 31 Dec 2024 13:51:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3B65A3858D35 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=kWImRrNc X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id 10F2E3858D20 for ; Tue, 31 Dec 2024 13:49:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 10F2E3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 10F2E3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735652974; cv=none; b=VWKnDWg5bL98FhFZY8TdWOae37yQOthJM25l2I4Hq02/nXD3a7MWNR1g4+bxOsBqHlNmQjb9m0ZIfKQnpujMqlKMsqcC+jFPNro0FmAJ9t4IShptE6xr8LgjuyPTUHJKqNelLZgw+xh+KzUDmvr/10fVvjXLtAgErxpCgA65+TE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1735652974; c=relaxed/simple; bh=7K5g9cIpAedKvUty51qIach+c+SrbA6T7bMmL5p58uw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=npSILZ/LoutCRCFdNXKlrjEgu1Kgsb3BVNaGB+1A2K5ukoPXSV+qlxQij3HF/KEIZYcv8p415M3JVg8bzzvsUMHEYengSp9D//zdVPaHgFiKju7cgU1juhqKQNrzPD5Nu4Gbk34OwZvBWa2qTobra/XZuTzT3gSoaXYKp0GF5fQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BD3CD258FA; Tue, 31 Dec 2024 14:49:32 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id t_Aim9DQcor3; Tue, 31 Dec 2024 14:49:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1735652968; bh=7K5g9cIpAedKvUty51qIach+c+SrbA6T7bMmL5p58uw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kWImRrNcDBQGahaVKzi62dRrLQteRmnc0LxgK+hi1ct5SMaZKU54DplP8toja6Igd 9SL6gGIMHKgo/WCrYtD6Pk90mhgonGxI067ckeVCJZKYA8eJHX2SWIMO6eMvaDvYmI iNXxHLJq9qXjKruN4IYh3aEXs3lq6hS0oZhV/gswMvKxsqqvVCtjTpYceqPn23XQt5 umRk/I/xjVaGjEBi+Yl7XeIxtPTjTHoV+i2EgBG1BFrx01S8cXYGQyvBxkXCh8Swv2 VzrJT+m2PSdRu/fP4xZoMAhVdfRr3erNovgZG11iH1Y+8Z/cSzo0O/vZTMJ12O0ucH AqjVl1wtTlNGg== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 2/8] htl: move pthread_mutexattr_destroy into libc. Date: Tue, 31 Dec 2024 15:49:03 +0200 Message-Id: <20241231134909.1166440-3-gfleury@disroot.org> In-Reply-To: <20241231134909.1166440-1-gfleury@disroot.org> References: <20241231134909.1166440-1-gfleury@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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 --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/libc-lockP.h | 5 ++--- 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(+), 8 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 6299f2c3..1555da73 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 ae0e7949..d3ee842e 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 710a7cb5..584eac20 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -77,7 +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); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); @@ -88,6 +88,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 +124,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 +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_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 767d13e0..dcf97a44 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 9a11c292..69af1452 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 7e4c7ff6..0fd3e538 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 191446e2..52e698f8 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 26cb3e64..90ea26b2 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