From patchwork Sun Feb 16 23:03:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106653 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 CDB8F3858D28 for ; Sun, 16 Feb 2025 23:08:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CDB8F3858D28 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 91BA43858D29 for ; Sun, 16 Feb 2025 23:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 91BA43858D29 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 91BA43858D29 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=1739747006; cv=none; b=vwXj9vAGz/9tW55uGxIW5YMSVT+cFz8XbP15WK4N7Itfm5iMqa1Ip1JUFgWtyWAcqw+15lSiiEN7gO2Vf6raSVTSk65SLewzk+XzDyaTUQA3d5Q0G8y2JRCm0zL57ZEqqiPcztGJ52wA6UZ2/ixc97ZKLv7w+fp6h8T58EGbe0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739747006; c=relaxed/simple; bh=BslQT1paXV7Ue6z1vYufLHhCrDMPYUgCThlyIFHAtY8=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=aZ97lxaTRIL0EszLRyrDBmOsYa3n/fmievm9aDpX3u/ELSsiZOlXZVQ64zgVLmLGeTLIVmhJ2ttVKJC6+GCotnxk7rlUM8fB6Rn6BY0WbrSB3WARexgdsdVSkEMnjFcMAg9MYWb67SCKpl4Xok7XoPAxQDK2+RnuJvG8U1WFwDo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 91BA43858D29 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 3D244A1C3D; Mon, 17 Feb 2025 00:03:14 +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 k8I0xtqJyhJ9; Mon, 17 Feb 2025 00:03:14 +0100 (CET) Received: from begin (aamiens-653-1-40-48.w83-192.abo.wanadoo.fr [83.192.199.48]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 6D015A1C43; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0cI-3oZO; Mon, 17 Feb 2025 00:03:12 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited 09/10] htl: move pthread_rwlock_init into libc. Date: Mon, 17 Feb 2025 00:03:09 +0100 Message-ID: <20250216230311.3097176-10-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250216230311.3097176-1-samuel.thibault@ens-lyon.org> References: <20250216230311.3097176-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, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: gfleury Signed-off-by: gfleury Message-ID: <20250216145434.7089-10-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 5 ++--- sysdeps/htl/libc-lockP.h | 2 +- sysdeps/htl/pt-rwlock-init.c | 9 +++++++-- 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, 15 insertions(+), 9 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 78d997d4ab..310097914f 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -45,7 +45,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutex-transfer-np \ - pt-rwlock-init \ pt-hurd-cond-wait \ pt-hurd-cond-timedwait \ pt-stack-alloc \ @@ -190,6 +189,7 @@ routines := \ pt-pthread_self \ pt-rwlock-attr \ pt-rwlock-destroy \ + pt-rwlock-init \ pt-rwlock-rdlock \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ diff --git a/htl/Versions b/htl/Versions index f636e6ede5..4fe2a45295 100644 --- a/htl/Versions +++ b/htl/Versions @@ -64,6 +64,7 @@ libc { pthread_mutexattr_setpshared; pthread_mutexattr_settype; pthread_rwlock_destroy; + pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; @@ -159,6 +160,7 @@ libc { pthread_mutex_trylock; pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; + pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; @@ -265,8 +267,6 @@ libpthread { pthread_once; - pthread_rwlock_init; - pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; @@ -320,6 +320,5 @@ libpthread { __pthread_getattr_np; __pthread_enable_asynccancel; __pthread_disable_asynccancel; - _pthread_rwlock_init; } } diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 1b5c23ebac..5085570baa 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -92,6 +92,7 @@ libc_hidden_proto (__pthread_mutexattr_destroy) extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr); +libc_hidden_proto (__pthread_rwlock_init) extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_destroy) @@ -124,7 +125,6 @@ libc_hidden_proto (__pthread_setcancelstate) single-threaded processes. */ #if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread) # ifdef weak_extern -weak_extern (__pthread_rwlock_init) weak_extern (__pthread_key_create) weak_extern (__pthread_setspecific) weak_extern (__pthread_getspecific) diff --git a/sysdeps/htl/pt-rwlock-init.c b/sysdeps/htl/pt-rwlock-init.c index 02bd1bffb9..e8a7c0242f 100644 --- a/sysdeps/htl/pt-rwlock-init.c +++ b/sysdeps/htl/pt-rwlock-init.c @@ -19,9 +19,10 @@ #include #include #include +#include int -_pthread_rwlock_init (pthread_rwlock_t *rwlock, +__pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr) { ASSERT_TYPE_SIZE (pthread_rwlock_t, __SIZEOF_PTHREAD_RWLOCK_T); @@ -42,5 +43,9 @@ _pthread_rwlock_init (pthread_rwlock_t *rwlock, *rwlock->__attr = *attr; return 0; } +libc_hidden_def (__pthread_rwlock_init) +versioned_symbol (libc, __pthread_rwlock_init, pthread_rwlock_init, GLIBC_2_42); -strong_alias (_pthread_rwlock_init, pthread_rwlock_init); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_init, pthread_rwlock_init, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index e96b22bde4..bf62539c57 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -89,6 +89,7 @@ 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_rwlock_destroy F +GLIBC_2.12 pthread_rwlock_init F GLIBC_2.12 pthread_rwlock_rdlock F GLIBC_2.12 pthread_rwlock_timedrdlock F GLIBC_2.12 pthread_rwlock_timedwrlock F @@ -2597,6 +2598,7 @@ GLIBC_2.42 pthread_mutex_trylock F GLIBC_2.42 pthread_rwlock_clockrdlock F GLIBC_2.42 pthread_rwlock_clockwrlock F GLIBC_2.42 pthread_rwlock_destroy F +GLIBC_2.42 pthread_rwlock_init F GLIBC_2.42 pthread_rwlock_rdlock F GLIBC_2.42 pthread_rwlock_timedrdlock F GLIBC_2.42 pthread_rwlock_timedwrlock F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 3ebfa63738..d9c1a1790a 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -36,7 +36,6 @@ GLIBC_2.12 pthread_key_delete F GLIBC_2.12 pthread_kill F GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_once F -GLIBC_2.12 pthread_rwlock_init F GLIBC_2.12 pthread_setconcurrency F GLIBC_2.12 pthread_setschedprio F GLIBC_2.12 pthread_setspecific F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index f5559a16fa..fb068ab45e 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1582,6 +1582,7 @@ GLIBC_2.38 pthread_mutexattr_settype F GLIBC_2.38 pthread_rwlock_clockrdlock F GLIBC_2.38 pthread_rwlock_clockwrlock F GLIBC_2.38 pthread_rwlock_destroy F +GLIBC_2.38 pthread_rwlock_init F GLIBC_2.38 pthread_rwlock_rdlock F GLIBC_2.38 pthread_rwlock_timedrdlock F GLIBC_2.38 pthread_rwlock_timedwrlock F @@ -2280,6 +2281,7 @@ GLIBC_2.42 pthread_mutex_trylock F GLIBC_2.42 pthread_rwlock_clockrdlock F GLIBC_2.42 pthread_rwlock_clockwrlock F GLIBC_2.42 pthread_rwlock_destroy F +GLIBC_2.42 pthread_rwlock_init F GLIBC_2.42 pthread_rwlock_rdlock F GLIBC_2.42 pthread_rwlock_timedrdlock F GLIBC_2.42 pthread_rwlock_timedwrlock F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 106aa09d8a..71ce1d6288 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -56,7 +56,6 @@ GLIBC_2.38 pthread_key_delete F GLIBC_2.38 pthread_kill F GLIBC_2.38 pthread_mutex_transfer_np F GLIBC_2.38 pthread_once F -GLIBC_2.38 pthread_rwlock_init F GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setschedprio F GLIBC_2.38 pthread_setspecific F