From patchwork Sun Feb 16 23:03:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106646 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 E68613858C31 for ; Sun, 16 Feb 2025 23:04:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E68613858C31 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 174BC3858C48 for ; Sun, 16 Feb 2025 23:03:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 174BC3858C48 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 174BC3858C48 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=1739746995; cv=none; b=W8TZ8pFaGOLPmzC7kz97Bb6sf0+AEUUq+SnQr44W62Q7mwZsCLSSobnMM98aB0apsbJRgeDi62s+we0Bvi+Dv/xDSEAfxh+moeEgVwEhDibpMLV+mJIPgziyqaec8zwM2rHKMyRjDfUYEK+ma0XVkd0EOcvPJfQqdVTrkVcuq5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739746995; c=relaxed/simple; bh=qjLySKmKGuHEuquoLJUzFO55VZBxNptifxf/nQs0YHw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=TycKsnuPeYDfnbdGG1Ul8qZtRYVMKXyl11psSUu0yPnNIl2wM7yCKD83GAu/3gftcoZbq7RPcEbPzI4fJCyC1iy0ImNd2mOGrrR/Oe9xzNQYMx1VRD4Cj0OWhI29Z+ETxldveMdo2aUZXps/uEtHSDPDIfNMXArVzkvavduvyRQ= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 174BC3858C48 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id AFE00A19A7; Mon, 17 Feb 2025 00:03:13 +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 Lvwr5ObnMZkg; Mon, 17 Feb 2025 00:03:13 +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 47EF7A0627; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0WL-2uX6; 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 01/10] htl: move __pthread_default_rwlockattr into libc. Date: Mon, 17 Feb 2025 00:03:01 +0100 Message-ID: <20250216230311.3097176-2-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.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 Signed-off-by: gfleury Message-ID: <20250216145434.7089-2-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 1 + htl/pt-internal.h | 1 + sysdeps/htl/pt-rwlock-attr.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htl/Makefile b/htl/Makefile index 2b2a49c7b7..13215943d7 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -45,7 +45,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutex-transfer-np \ - pt-rwlock-attr \ pt-rwlockattr-init \ pt-rwlockattr-destroy \ pt-rwlockattr-getpshared \ @@ -201,6 +200,7 @@ routines := \ pt-mutexattr-settype \ pt-nthreads \ pt-pthread_self \ + pt-rwlock-attr \ pt-self pt-equal \ pt-setcancelstate \ pt-setcanceltype \ diff --git a/htl/Versions b/htl/Versions index dd3be82e9e..ff24da0190 100644 --- a/htl/Versions +++ b/htl/Versions @@ -171,6 +171,7 @@ libc { __pthread_cond_wait; __pthread_condattr_init; __pthread_default_condattr; + __pthread_default_rwlockattr; __pthread_mutex_checklocked; __pthread_mutex_destroy; __pthread_mutex_init; diff --git a/htl/pt-internal.h b/htl/pt-internal.h index d19579b33b..cd4ebc0a6a 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -331,6 +331,7 @@ extern const struct __pthread_barrierattr __pthread_default_barrierattr; /* Default rdlock attributes. */ extern const struct __pthread_rwlockattr __pthread_default_rwlockattr; +libc_hidden_proto (__pthread_default_rwlockattr) /* Default condition attributes. */ extern const struct __pthread_condattr __pthread_default_condattr; diff --git a/sysdeps/htl/pt-rwlock-attr.c b/sysdeps/htl/pt-rwlock-attr.c index 999e108ecf..98dd4c9d69 100644 --- a/sysdeps/htl/pt-rwlock-attr.c +++ b/sysdeps/htl/pt-rwlock-attr.c @@ -22,3 +22,4 @@ const struct __pthread_rwlockattr __pthread_default_rwlockattr = { __pshared: PTHREAD_PROCESS_PRIVATE }; +libc_hidden_data_def (__pthread_default_rwlockattr) From patchwork Sun Feb 16 23:03:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106644 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 DD4F83858C48 for ; Sun, 16 Feb 2025 23:04:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD4F83858C48 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 9CF1F3858CD1 for ; Sun, 16 Feb 2025 23:03:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9CF1F3858CD1 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 9CF1F3858CD1 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=1739746994; cv=none; b=Xpv5MJGfbt9nXTMd9WjKyY80CqhjFgBFI5Fs93OfacDXJTGcj0HAnIUxQCgJWhlkRlxHc85w/t3RqSeua0tsYk4aOQV4UnAFVEswQR3ke0IM1z5q6QS1mHmM5PBBrVDxybbzHAREOFarLz9J018Ahi41oEcpaCBALmjeu0vF4fE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739746994; c=relaxed/simple; bh=+DTHL/jWOwjMiUuBWq6uddawcVBmcPrUYQ59WOnpvOE=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=c0bBJ+0YfIsiQHXjEWdvSQSsZJUAAk6lYeLPLFLqUApBtRIvh9UZIFnX0Yj2ODRwiOIy1m0okhBWIHhlOT5bUuxa9hZfoXoHEx8H84inU8cvYry2rNs269xUnuwTlo3hhhOUt7e0cisXMj4eftm9HDZbfhfjYQNYsf0mS4/2eZw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9CF1F3858CD1 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 8667FA5E29; Mon, 17 Feb 2025 00:03:13 +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 6G-fISO1Lf_J; Mon, 17 Feb 2025 00:03:13 +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 481E4A19A7; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0X1-30mb; 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 02/10] htl: move pthread_rwlockattr_init into libc. Date: Mon, 17 Feb 2025 00:03:02 +0100 Message-ID: <20250216230311.3097176-3-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-3-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/pt-rwlockattr-init.c | 9 ++++++++- sysdeps/htl/pthreadP.h | 2 ++ 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, 18 insertions(+), 5 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 13215943d7..2d275dac1c 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -45,7 +45,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutex-transfer-np \ - pt-rwlockattr-init \ pt-rwlockattr-destroy \ pt-rwlockattr-getpshared \ pt-rwlockattr-setpshared \ @@ -201,6 +200,7 @@ routines := \ pt-nthreads \ pt-pthread_self \ pt-rwlock-attr \ + pt-rwlockattr-init \ pt-self pt-equal \ pt-setcancelstate \ pt-setcanceltype \ diff --git a/htl/Versions b/htl/Versions index ff24da0190..c02ac04e22 100644 --- a/htl/Versions +++ b/htl/Versions @@ -63,6 +63,7 @@ libc { pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_rwlockattr_init; pthread_setcancelstate; pthread_setcanceltype; pthread_sigmask; @@ -142,6 +143,7 @@ libc { pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutex_trylock; + pthread_rwlockattr_init; } GLIBC_PRIVATE { @@ -243,7 +245,7 @@ libpthread { pthread_rwlock_unlock; pthread_rwlock_wrlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; - pthread_rwlockattr_init; pthread_rwlockattr_setpshared; + pthread_rwlockattr_setpshared; pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; diff --git a/sysdeps/htl/pt-rwlockattr-init.c b/sysdeps/htl/pt-rwlockattr-init.c index 04a3ca62be..ce3f3c655d 100644 --- a/sysdeps/htl/pt-rwlockattr-init.c +++ b/sysdeps/htl/pt-rwlockattr-init.c @@ -18,12 +18,19 @@ #include #include +#include int -pthread_rwlockattr_init (pthread_rwlockattr_t *attr) +__pthread_rwlockattr_init (pthread_rwlockattr_t *attr) { ASSERT_TYPE_SIZE (pthread_rwlockattr_t, __SIZEOF_PTHREAD_RWLOCKATTR_T); *attr = __pthread_default_rwlockattr; return 0; } +libc_hidden_def (__pthread_rwlockattr_init) +versioned_symbol (libc, __pthread_rwlockattr_init, pthread_rwlockattr_init, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlockattr_init, pthread_rwlockattr_init, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 9ded2f8576..2f779d27cc 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -114,6 +114,8 @@ 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_rwlockattr_init (pthread_rwlockattr_t *__attr); +libc_hidden_proto (__pthread_rwlockattr_init) extern int __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 0a100f876d..096ab46b38 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -88,6 +88,7 @@ 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_rwlockattr_init F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setcancelstate F GLIBC_2.12 pthread_setcanceltype F @@ -2580,6 +2581,7 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F +GLIBC_2.42 pthread_rwlockattr_init F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index d85b9d6912..7a20505888 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -47,7 +47,6 @@ GLIBC_2.12 pthread_rwlock_unlock F GLIBC_2.12 pthread_rwlock_wrlock F GLIBC_2.12 pthread_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_getpshared F -GLIBC_2.12 pthread_rwlockattr_init F GLIBC_2.12 pthread_rwlockattr_setpshared F GLIBC_2.12 pthread_setconcurrency F GLIBC_2.12 pthread_setschedprio F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 2266d3c846..d0010a3ce9 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1579,6 +1579,7 @@ 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_rwlockattr_init F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcanceltype F @@ -2263,6 +2264,7 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F +GLIBC_2.42 pthread_rwlockattr_init F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F HURD_CTHREADS_0.3 __cthread_setspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 37b6190c13..a5f5b0a2c7 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -69,7 +69,6 @@ GLIBC_2.38 pthread_rwlock_unlock F GLIBC_2.38 pthread_rwlock_wrlock F GLIBC_2.38 pthread_rwlockattr_destroy F GLIBC_2.38 pthread_rwlockattr_getpshared F -GLIBC_2.38 pthread_rwlockattr_init F GLIBC_2.38 pthread_rwlockattr_setpshared F GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setschedprio F From patchwork Sun Feb 16 23:03:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106647 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 5132A3858C66 for ; Sun, 16 Feb 2025 23:04:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5132A3858C66 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 0F2D33858C41 for ; Sun, 16 Feb 2025 23:03:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F2D33858C41 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 0F2D33858C41 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=1739746995; cv=none; b=YATT1Vn6Wk3kK9KjW4E0HPiH+Fq4yqDV5ozpNHUOFMwDZRD0Jc6XAzz/wwW3LcgQeVRlfw7kuOBdQknVVAKXcHvrjAHD0Mt4qNtnkrRLuWOXRJQoy+uFvcuZHva9z/fLNMh0OdIxN3IFq57Ai9D5EJ8vLx6SpTAMtFF15+T/S+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739746995; c=relaxed/simple; bh=jDqodXKjmWbn48JodaGvacwfDnYP8W7MelAadJ8S1fk=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=qPvX05N+Q+gFVDPAMKRvGM7xpWotuOwCN9PhQ2OS2iuSn2q8VbU3xGBrc8dzLGWMuywm/UvJu+RRzwrqO7aZethnQ2Kmux3vfFVm9x8ofFh9aONpr7fdHn8IVe8I4HeOvEqjhvjFDj0Z+VBum1ALXIX+CaNVVMRzSP7TOAPruqY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0F2D33858C41 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 89832A5E2F; Mon, 17 Feb 2025 00:03:13 +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 jF2S9ZvGdWxD; Mon, 17 Feb 2025 00:03:13 +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 4E7BBA19AB; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0Xh-37MX; 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 03/10] htl: move pthread_rwlockattr_destroy into libc. Date: Mon, 17 Feb 2025 00:03:03 +0100 Message-ID: <20250216230311.3097176-4-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.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 Signed-off-by: gfleury Message-ID: <20250216145434.7089-4-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- sysdeps/htl/pt-rwlockattr-destroy.c | 9 ++++++++- sysdeps/htl/pthreadP.h | 2 ++ 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, 18 insertions(+), 5 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 2d275dac1c..84b85f1a9a 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -45,7 +45,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutex-transfer-np \ - pt-rwlockattr-destroy \ pt-rwlockattr-getpshared \ pt-rwlockattr-setpshared \ pt-rwlock-init \ @@ -200,6 +199,7 @@ routines := \ pt-nthreads \ pt-pthread_self \ pt-rwlock-attr \ + pt-rwlockattr-destroy \ pt-rwlockattr-init \ pt-self pt-equal \ pt-setcancelstate \ diff --git a/htl/Versions b/htl/Versions index c02ac04e22..f6a1566a20 100644 --- a/htl/Versions +++ b/htl/Versions @@ -63,6 +63,7 @@ libc { pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_rwlockattr_destroy; pthread_rwlockattr_init; pthread_setcancelstate; pthread_setcanceltype; @@ -143,6 +144,7 @@ libc { pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutex_trylock; + pthread_rwlockattr_destroy; pthread_rwlockattr_init; } @@ -244,7 +246,7 @@ libpthread { pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; pthread_rwlock_wrlock; - pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; + pthread_rwlockattr_getpshared; pthread_rwlockattr_setpshared; pthread_setconcurrency; diff --git a/sysdeps/htl/pt-rwlockattr-destroy.c b/sysdeps/htl/pt-rwlockattr-destroy.c index cf73625ce7..671eb84ed2 100644 --- a/sysdeps/htl/pt-rwlockattr-destroy.c +++ b/sysdeps/htl/pt-rwlockattr-destroy.c @@ -18,9 +18,16 @@ #include #include +#include int -pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr) +__pthread_rwlockattr_destroy (pthread_rwlockattr_t *attr) { return 0; } +libc_hidden_def (__pthread_rwlockattr_destroy) +versioned_symbol (libc, __pthread_rwlockattr_destroy, pthread_rwlockattr_destroy, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlockattr_destroy, pthread_rwlockattr_destroy, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 2f779d27cc..0f22c85d41 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -114,6 +114,8 @@ 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_rwlockattr_destroy (pthread_rwlockattr_t *__attr); +libc_hidden_proto (__pthread_rwlockattr_destroy) extern int __pthread_rwlockattr_init (pthread_rwlockattr_t *__attr); libc_hidden_proto (__pthread_rwlockattr_init) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 096ab46b38..2ed475b751 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -88,6 +88,7 @@ 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_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_init F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setcancelstate F @@ -2581,6 +2582,7 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F +GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_init 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 7a20505888..ad5fb60d4b 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -45,7 +45,6 @@ GLIBC_2.12 pthread_rwlock_tryrdlock F GLIBC_2.12 pthread_rwlock_trywrlock F GLIBC_2.12 pthread_rwlock_unlock F GLIBC_2.12 pthread_rwlock_wrlock F -GLIBC_2.12 pthread_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_getpshared F GLIBC_2.12 pthread_rwlockattr_setpshared F GLIBC_2.12 pthread_setconcurrency F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index d0010a3ce9..9ab097d9d8 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1579,6 +1579,7 @@ 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_rwlockattr_destroy F GLIBC_2.38 pthread_rwlockattr_init F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F @@ -2264,6 +2265,7 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F +GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_init 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 a5f5b0a2c7..a6c70d36ad 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -67,7 +67,6 @@ GLIBC_2.38 pthread_rwlock_tryrdlock F GLIBC_2.38 pthread_rwlock_trywrlock F GLIBC_2.38 pthread_rwlock_unlock F GLIBC_2.38 pthread_rwlock_wrlock F -GLIBC_2.38 pthread_rwlockattr_destroy F GLIBC_2.38 pthread_rwlockattr_getpshared F GLIBC_2.38 pthread_rwlockattr_setpshared F GLIBC_2.38 pthread_setconcurrency F From patchwork Sun Feb 16 23:03:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106648 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 6626D3858403 for ; Sun, 16 Feb 2025 23:05:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6626D3858403 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 4B9C63858CDA for ; Sun, 16 Feb 2025 23:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4B9C63858CDA 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 4B9C63858CDA 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=fgygsnyFZ55fsBcnUAeQAnXNafiML3xnw9ji573OytH3fP5BMAQRjoyd8W6QIQpRNe+5x93bxivc9kb+XNpUEnq+i5NLUPMlUoSQvIZma/QIzEnhPMgjGa/zWRE3vO38jIz6AiWE7ug50dO5DoLZKqG5YYQ0r4cfiWFUysvVBvw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739747006; c=relaxed/simple; bh=m95Y5dLO4aUlsCGd95ncgr+J1e+yacvc1S1poNHIrDw=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=lSH4L49yLUuJOz6SEFNK0fZjaNk03EKTbcKTpY3q4oCKAdqqt2/LoxnKOt+cadhKwrGpPXnWdoyTm+YlTGGCvUTjwBAvLCbPubNxR4oYeUTuq/PlQPvoaFzH8RKZupYQKhLc1wC6jGJE8FcGamPxi8abn8mFDnYm6IHQV8PjVrY= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4B9C63858CDA Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 16D4CA1C3A; 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 HNP-Vx6BxKUk; Mon, 17 Feb 2025 00:03:13 +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 5EC25A1C38; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0YQ-3Fpn; 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 04/10] htl: move pthread_rwlockattr_getpshared, pthread_rwlockattr_setpshared into libc. Date: Mon, 17 Feb 2025 00:03:04 +0100 Message-ID: <20250216230311.3097176-5-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-5-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 7 ++++--- sysdeps/htl/pt-rwlockattr-getpshared.c | 9 ++++++++- sysdeps/htl/pt-rwlockattr-setpshared.c | 9 ++++++++- sysdeps/htl/pthreadP.h | 6 ++++++ 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, 36 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 84b85f1a9a..651af8d82a 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -45,8 +45,6 @@ libpthread-routines := \ pt-testcancel \ pt-cancel \ pt-mutex-transfer-np \ - pt-rwlockattr-getpshared \ - pt-rwlockattr-setpshared \ pt-rwlock-init \ pt-rwlock-destroy \ pt-rwlock-rdlock \ @@ -200,7 +198,9 @@ routines := \ pt-pthread_self \ pt-rwlock-attr \ pt-rwlockattr-destroy \ + pt-rwlockattr-getpshared \ pt-rwlockattr-init \ + pt-rwlockattr-setpshared \ pt-self pt-equal \ pt-setcancelstate \ pt-setcanceltype \ diff --git a/htl/Versions b/htl/Versions index f6a1566a20..1d666bcb3c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -64,7 +64,9 @@ libc { pthread_mutexattr_setpshared; pthread_mutexattr_settype; pthread_rwlockattr_destroy; + pthread_rwlockattr_getpshared; pthread_rwlockattr_init; + pthread_rwlockattr_setpshared; pthread_setcancelstate; pthread_setcanceltype; pthread_sigmask; @@ -145,7 +147,9 @@ libc { pthread_mutex_setprioceiling; pthread_mutex_trylock; pthread_rwlockattr_destroy; + pthread_rwlockattr_getpshared; pthread_rwlockattr_init; + pthread_rwlockattr_setpshared; } GLIBC_PRIVATE { @@ -246,9 +250,6 @@ libpthread { pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; pthread_rwlock_wrlock; - pthread_rwlockattr_getpshared; - pthread_rwlockattr_setpshared; - pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; diff --git a/sysdeps/htl/pt-rwlockattr-getpshared.c b/sysdeps/htl/pt-rwlockattr-getpshared.c index 9e57d39c41..15470ada09 100644 --- a/sysdeps/htl/pt-rwlockattr-getpshared.c +++ b/sysdeps/htl/pt-rwlockattr-getpshared.c @@ -18,10 +18,17 @@ #include #include +#include int -pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared) +__pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr, int *pshared) { *pshared = attr->__pshared; return 0; } +libc_hidden_def (__pthread_rwlockattr_getpshared) +versioned_symbol (libc, __pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pt-rwlockattr-setpshared.c b/sysdeps/htl/pt-rwlockattr-setpshared.c index 94fdf761c0..e23a032d4a 100644 --- a/sysdeps/htl/pt-rwlockattr-setpshared.c +++ b/sysdeps/htl/pt-rwlockattr-setpshared.c @@ -18,9 +18,10 @@ #include #include +#include int -pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared) +__pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared) { switch (pshared) { @@ -35,4 +36,10 @@ pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared) return EINVAL; } } +libc_hidden_def (__pthread_rwlockattr_setpshared) +versioned_symbol (libc, __pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared, GLIBC_2_12); +#endif stub_warning (pthread_rwlockattr_setpshared) diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 0f22c85d41..d77cee51a5 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -116,8 +116,14 @@ extern int __pthread_mutexattr_settype(pthread_mutexattr_t *__attr, libc_hidden_proto (__pthread_mutexattr_settype) extern int __pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr); libc_hidden_proto (__pthread_rwlockattr_destroy) +extern int __pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__attr, + int *__pshared); +libc_hidden_proto (__pthread_rwlockattr_getpshared) extern int __pthread_rwlockattr_init (pthread_rwlockattr_t *__attr); libc_hidden_proto (__pthread_rwlockattr_init) +extern int __pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr, + int __pshared); +libc_hidden_proto (__pthread_rwlockattr_setpshared) extern int __pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 2ed475b751..55ad6b423f 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -89,7 +89,9 @@ 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_rwlockattr_destroy F +GLIBC_2.12 pthread_rwlockattr_getpshared F GLIBC_2.12 pthread_rwlockattr_init F +GLIBC_2.12 pthread_rwlockattr_setpshared F GLIBC_2.12 pthread_self F GLIBC_2.12 pthread_setcancelstate F GLIBC_2.12 pthread_setcanceltype F @@ -2583,7 +2585,9 @@ GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F GLIBC_2.42 pthread_rwlockattr_destroy F +GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F +GLIBC_2.42 pthread_rwlockattr_setpshared F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index ad5fb60d4b..df7c46455a 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -45,8 +45,6 @@ GLIBC_2.12 pthread_rwlock_tryrdlock F GLIBC_2.12 pthread_rwlock_trywrlock F GLIBC_2.12 pthread_rwlock_unlock F GLIBC_2.12 pthread_rwlock_wrlock F -GLIBC_2.12 pthread_rwlockattr_getpshared F -GLIBC_2.12 pthread_rwlockattr_setpshared 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 9ab097d9d8..3075e10305 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1580,7 +1580,9 @@ 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_rwlockattr_destroy F +GLIBC_2.38 pthread_rwlockattr_getpshared F GLIBC_2.38 pthread_rwlockattr_init F +GLIBC_2.38 pthread_rwlockattr_setpshared F GLIBC_2.38 pthread_self F GLIBC_2.38 pthread_setcancelstate F GLIBC_2.38 pthread_setcanceltype F @@ -2266,7 +2268,9 @@ GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F GLIBC_2.42 pthread_rwlockattr_destroy F +GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F +GLIBC_2.42 pthread_rwlockattr_setpshared F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F HURD_CTHREADS_0.3 __cthread_setspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index a6c70d36ad..89fe63f256 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -67,8 +67,6 @@ GLIBC_2.38 pthread_rwlock_tryrdlock F GLIBC_2.38 pthread_rwlock_trywrlock F GLIBC_2.38 pthread_rwlock_unlock F GLIBC_2.38 pthread_rwlock_wrlock F -GLIBC_2.38 pthread_rwlockattr_getpshared F -GLIBC_2.38 pthread_rwlockattr_setpshared F GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setschedprio F GLIBC_2.38 pthread_setspecific F From patchwork Sun Feb 16 23:03:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106649 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 627D03858C54 for ; Sun, 16 Feb 2025 23:05:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 627D03858C54 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 464DB3858D1E for ; Sun, 16 Feb 2025 23:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 464DB3858D1E 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 464DB3858D1E 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=rJ/IIvrg2aEbuNkkarLIm/rL3I6PkkQu7kX2Olf1mvcbCztEw0mQbu2S9ExtBo+Ji/vEiP529cUpNsFFZ0+TL1MzwOyDzu00sFg+76QjYNSbsgnFnnj+5kwnuk4upCgAtTeJ7QCdaNNL/BKxTZg6KLcEbJAxpwkTSjRSLGc9iNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739747006; c=relaxed/simple; bh=zQuOrfD4z/6ZOZNqeayYz9rEZRexAAoEtpXQjS4xE5I=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=FPjcGupCZzu93xb897EJ0Ku6g6Lf6ogZsQsOHP360PfGw5ZlE4v2bMn0zOfWmDWoRc5V8EtIjVE8816cB7gfabU2+lLBa2a1ozBUMlkmWNse1pWl7+Q4ZKWhqcTMM2yC1ikpws2VGdiQ7bCC9fcDU9GCKp0q1LkDm413Byf8pnc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 464DB3858D1E Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id DF59EA1ACE; Mon, 17 Feb 2025 00:03:13 +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 09vYJoFubQq4; Mon, 17 Feb 2025 00:03:13 +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 60182A1C3A; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0ZG-3M86; 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 05/10] htl: move pthread_rwlock_tryrdlock, pthread_rwlock_trywrlock into libc. Date: Mon, 17 Feb 2025 00:03:05 +0100 Message-ID: <20250216230311.3097176-6-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-6-gfleury@disroot.org> --- htl/Makefile | 4 ++-- htl/Versions | 5 ++++- sysdeps/htl/libc-lockP.h | 6 ++---- sysdeps/htl/pt-rwlock-tryrdlock.c | 10 ++++++++-- sysdeps/htl/pt-rwlock-trywrlock.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, 32 insertions(+), 15 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 651af8d82a..0c85ab462c 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -48,8 +48,6 @@ libpthread-routines := \ pt-rwlock-init \ pt-rwlock-destroy \ pt-rwlock-rdlock \ - pt-rwlock-tryrdlock \ - pt-rwlock-trywrlock \ pt-rwlock-wrlock \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ @@ -197,6 +195,8 @@ routines := \ pt-nthreads \ pt-pthread_self \ pt-rwlock-attr \ + pt-rwlock-tryrdlock \ + pt-rwlock-trywrlock \ pt-rwlockattr-destroy \ pt-rwlockattr-getpshared \ pt-rwlockattr-init \ diff --git a/htl/Versions b/htl/Versions index 1d666bcb3c..ca59cd5c99 100644 --- a/htl/Versions +++ b/htl/Versions @@ -63,6 +63,8 @@ libc { pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_rwlock_tryrdlock; + pthread_rwlock_trywrlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; @@ -146,6 +148,8 @@ libc { pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutex_trylock; + pthread_rwlock_tryrdlock; + pthread_rwlock_trywrlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; @@ -247,7 +251,6 @@ libpthread { pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; - pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; pthread_rwlock_wrlock; pthread_setconcurrency; diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 6804c0d636..5fad451dfc 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -98,10 +98,12 @@ extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock); extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock); extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock); +libc_hidden_proto (__pthread_rwlock_tryrdlock) extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock); extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock); +libc_hidden_proto (__pthread_rwlock_trywrlock) extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock); @@ -121,9 +123,7 @@ libc_hidden_proto (__pthread_setcancelstate) weak_extern (__pthread_rwlock_init) weak_extern (__pthread_rwlock_destroy) weak_extern (__pthread_rwlock_rdlock) -weak_extern (__pthread_rwlock_tryrdlock) weak_extern (__pthread_rwlock_wrlock) -weak_extern (__pthread_rwlock_trywrlock) weak_extern (__pthread_rwlock_unlock) weak_extern (__pthread_key_create) weak_extern (__pthread_setspecific) @@ -134,9 +134,7 @@ weak_extern (__pthread_atfork) # else # pragma weak __pthread_rwlock_destroy # pragma weak __pthread_rwlock_rdlock -# pragma weak __pthread_rwlock_tryrdlock # pragma weak __pthread_rwlock_wrlock -# pragma weak __pthread_rwlock_trywrlock # pragma weak __pthread_rwlock_unlock # pragma weak __pthread_key_create # pragma weak __pthread_setspecific diff --git a/sysdeps/htl/pt-rwlock-tryrdlock.c b/sysdeps/htl/pt-rwlock-tryrdlock.c index c34ffccbc4..74aa636f93 100644 --- a/sysdeps/htl/pt-rwlock-tryrdlock.c +++ b/sysdeps/htl/pt-rwlock-tryrdlock.c @@ -18,12 +18,12 @@ #include #include - #include +#include /* Try to acquire RWLOCK. */ int -pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock) +__pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock) { __pthread_spin_wait (&rwlock->__lock); if (__pthread_spin_trylock (&rwlock->__held) == 0) @@ -53,3 +53,9 @@ pthread_rwlock_tryrdlock (struct __pthread_rwlock *rwlock) return EBUSY; } +libc_hidden_def (__pthread_rwlock_tryrdlock) +versioned_symbol (libc, __pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pt-rwlock-trywrlock.c b/sysdeps/htl/pt-rwlock-trywrlock.c index 926637a3ff..8de0e59132 100644 --- a/sysdeps/htl/pt-rwlock-trywrlock.c +++ b/sysdeps/htl/pt-rwlock-trywrlock.c @@ -18,12 +18,12 @@ #include #include - #include +#include /* Try to acquire RWLOCK for writing. */ int -pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock) +__pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock) { __pthread_spin_wait (&rwlock->__lock); if (__pthread_spin_trylock (&rwlock->__held) == 0) @@ -43,3 +43,9 @@ pthread_rwlock_trywrlock (struct __pthread_rwlock *rwlock) return EBUSY; } +libc_hidden_def (__pthread_rwlock_trywrlock) +versioned_symbol (libc, __pthread_rwlock_trywrlock, pthread_rwlock_trywrlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_trywrlock, pthread_rwlock_trywrlock, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 55ad6b423f..3d786282fa 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -88,6 +88,8 @@ 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_rwlock_tryrdlock F +GLIBC_2.12 pthread_rwlock_trywrlock F GLIBC_2.12 pthread_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_getpshared F GLIBC_2.12 pthread_rwlockattr_init F @@ -2584,6 +2586,8 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F +GLIBC_2.42 pthread_rwlock_tryrdlock F +GLIBC_2.42 pthread_rwlock_trywrlock F GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index df7c46455a..70db951b10 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -41,8 +41,6 @@ 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 -GLIBC_2.12 pthread_rwlock_tryrdlock F -GLIBC_2.12 pthread_rwlock_trywrlock F GLIBC_2.12 pthread_rwlock_unlock F GLIBC_2.12 pthread_rwlock_wrlock F GLIBC_2.12 pthread_setconcurrency F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 3075e10305..305cdb8cef 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1579,6 +1579,8 @@ 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_rwlock_tryrdlock F +GLIBC_2.38 pthread_rwlock_trywrlock F GLIBC_2.38 pthread_rwlockattr_destroy F GLIBC_2.38 pthread_rwlockattr_getpshared F GLIBC_2.38 pthread_rwlockattr_init F @@ -2267,6 +2269,8 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F +GLIBC_2.42 pthread_rwlock_tryrdlock F +GLIBC_2.42 pthread_rwlock_trywrlock F GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index 89fe63f256..b712a1b3bf 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -63,8 +63,6 @@ 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 -GLIBC_2.38 pthread_rwlock_tryrdlock F -GLIBC_2.38 pthread_rwlock_trywrlock F GLIBC_2.38 pthread_rwlock_unlock F GLIBC_2.38 pthread_rwlock_wrlock F GLIBC_2.38 pthread_setconcurrency F From patchwork Sun Feb 16 23:03:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106645 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 49C8F3858C31 for ; Sun, 16 Feb 2025 23:04:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 49C8F3858C31 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 EB4413858D38 for ; Sun, 16 Feb 2025 23:03:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EB4413858D38 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 EB4413858D38 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=1739746995; cv=none; b=nxvVTOVe1SNFX6XZRakeZ8M0LQ0zHbTyrwWqr592slVxdi0TsMU01DXic9xiQ3Xzq8KFwNWfQmLEQYIbhwXw+uLOCCRJ5ka5xlZRVgy/1FH60OLqE2wPAj3Z86FQbJrfBipRRbc7XpdNUjX6Fq1zcq0Zn3nLOGVgsnfdbZFMeaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739746995; c=relaxed/simple; bh=IIn8BCdNeKxzbFBTQprkV6tlVDpqvViZ20d8cdVNL9M=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=xuz0ERiVksi19ZtKyukfiofN7fVJndt5oJgaGvnU0uSi4nH0W37rKb8ZdTJ8tyXcysP1hMg+VlBZopEhdYJhwSy7ye7K9Y6VXCFSVRd2ZkSAgbYVAU30QHM70MCPMQALMWVk+EkaAINtHyUfdbykPxrHZEn93Rs0+N9xesbBeNc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EB4413858D38 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id DB5CFA0627; Mon, 17 Feb 2025 00:03:13 +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 EAny2OlMWJ0Q; Mon, 17 Feb 2025 00:03:13 +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 606B6A1C3C; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0a1-3UHQ; 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 06/10] htl: move pthread_rwlock_unlock into libc. Date: Mon, 17 Feb 2025 00:03:06 +0100 Message-ID: <20250216230311.3097176-7-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-7-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 +++- htl/pt-initialize.c | 1 - sysdeps/htl/libc-lockP.h | 3 +-- sysdeps/htl/pt-rwlock-unlock.c | 8 +++++++- sysdeps/htl/pthread-functions.h | 2 -- 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 - 10 files changed, 16 insertions(+), 10 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 0c85ab462c..d5ab98c840 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -51,7 +51,6 @@ libpthread-routines := \ pt-rwlock-wrlock \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ - pt-rwlock-unlock \ pt-hurd-cond-wait \ pt-hurd-cond-timedwait \ pt-stack-alloc \ @@ -197,6 +196,7 @@ routines := \ pt-rwlock-attr \ pt-rwlock-tryrdlock \ pt-rwlock-trywrlock \ + pt-rwlock-unlock \ pt-rwlockattr-destroy \ pt-rwlockattr-getpshared \ pt-rwlockattr-init \ diff --git a/htl/Versions b/htl/Versions index ca59cd5c99..9669fe9dbc 100644 --- a/htl/Versions +++ b/htl/Versions @@ -65,6 +65,7 @@ libc { pthread_mutexattr_settype; pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; + pthread_rwlock_unlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; @@ -150,6 +151,7 @@ libc { pthread_mutex_trylock; pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; + pthread_rwlock_unlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; @@ -251,7 +253,7 @@ libpthread { pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; - pthread_rwlock_unlock; pthread_rwlock_wrlock; + pthread_rwlock_wrlock; pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 53b9c76e8f..14172099d4 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -32,7 +32,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_once = __pthread_once, .ptr_pthread_rwlock_rdlock = __pthread_rwlock_rdlock, .ptr_pthread_rwlock_wrlock = __pthread_rwlock_wrlock, - .ptr_pthread_rwlock_unlock = __pthread_rwlock_unlock, .ptr___pthread_key_create = __pthread_key_create, .ptr___pthread_getspecific = __pthread_getspecific, .ptr___pthread_setspecific = __pthread_setspecific, diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 5fad451dfc..7e9bdd1c4b 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -106,6 +106,7 @@ extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_trywrlock) extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock); +libc_hidden_proto (__pthread_rwlock_unlock) extern int __pthread_once (pthread_once_t *__once_control, void (*__init_routine) (void)); @@ -124,7 +125,6 @@ weak_extern (__pthread_rwlock_init) weak_extern (__pthread_rwlock_destroy) weak_extern (__pthread_rwlock_rdlock) weak_extern (__pthread_rwlock_wrlock) -weak_extern (__pthread_rwlock_unlock) weak_extern (__pthread_key_create) weak_extern (__pthread_setspecific) weak_extern (__pthread_getspecific) @@ -135,7 +135,6 @@ weak_extern (__pthread_atfork) # pragma weak __pthread_rwlock_destroy # pragma weak __pthread_rwlock_rdlock # pragma weak __pthread_rwlock_wrlock -# pragma weak __pthread_rwlock_unlock # pragma weak __pthread_key_create # pragma weak __pthread_setspecific # pragma weak __pthread_getspecific diff --git a/sysdeps/htl/pt-rwlock-unlock.c b/sysdeps/htl/pt-rwlock-unlock.c index 6465ace772..5012add1f9 100644 --- a/sysdeps/htl/pt-rwlock-unlock.c +++ b/sysdeps/htl/pt-rwlock-unlock.c @@ -19,6 +19,7 @@ #include #include +#include /* Unlock *RWLOCK, rescheduling a waiting writer thread or, if there are no threads waiting for a write lock, rescheduling the reader @@ -95,4 +96,9 @@ __pthread_rwlock_unlock (pthread_rwlock_t *rwlock) __pthread_spin_unlock (&rwlock->__lock); return 0; } -weak_alias (__pthread_rwlock_unlock, pthread_rwlock_unlock); +libc_hidden_def (__pthread_rwlock_unlock) +versioned_symbol (libc, __pthread_rwlock_unlock, pthread_rwlock_unlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_unlock, pthread_rwlock_unlock, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 56b5b2383e..7dd6fadc17 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -26,7 +26,6 @@ struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); int __pthread_once (pthread_once_t *, void (*) (void)); int __pthread_rwlock_rdlock (pthread_rwlock_t *); int __pthread_rwlock_wrlock (pthread_rwlock_t *); -int __pthread_rwlock_unlock (pthread_rwlock_t *); int __pthread_key_create (pthread_key_t *, void (*) (void *)); void *__pthread_getspecific (pthread_key_t); int __pthread_setspecific (pthread_key_t, const void *); @@ -45,7 +44,6 @@ struct pthread_functions int (*ptr_pthread_once) (pthread_once_t *, void (*) (void)); int (*ptr_pthread_rwlock_rdlock) (pthread_rwlock_t *); int (*ptr_pthread_rwlock_wrlock) (pthread_rwlock_t *); - int (*ptr_pthread_rwlock_unlock) (pthread_rwlock_t *); int (*ptr___pthread_key_create) (pthread_key_t *, void (*) (void *)); void *(*ptr___pthread_getspecific) (pthread_key_t); int (*ptr___pthread_setspecific) (pthread_key_t, const void *); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 3d786282fa..8df2a87d6a 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -90,6 +90,7 @@ GLIBC_2.12 pthread_mutexattr_setpshared F GLIBC_2.12 pthread_mutexattr_settype F GLIBC_2.12 pthread_rwlock_tryrdlock F GLIBC_2.12 pthread_rwlock_trywrlock F +GLIBC_2.12 pthread_rwlock_unlock F GLIBC_2.12 pthread_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_getpshared F GLIBC_2.12 pthread_rwlockattr_init F @@ -2588,6 +2589,7 @@ GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F GLIBC_2.42 pthread_rwlock_tryrdlock F GLIBC_2.42 pthread_rwlock_trywrlock F +GLIBC_2.42 pthread_rwlock_unlock F GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 70db951b10..8ba641f611 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -41,7 +41,6 @@ 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 -GLIBC_2.12 pthread_rwlock_unlock F GLIBC_2.12 pthread_rwlock_wrlock F GLIBC_2.12 pthread_setconcurrency F GLIBC_2.12 pthread_setschedprio F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 305cdb8cef..472c1b2ea8 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1581,6 +1581,7 @@ GLIBC_2.38 pthread_mutexattr_setrobust_np F GLIBC_2.38 pthread_mutexattr_settype F GLIBC_2.38 pthread_rwlock_tryrdlock F GLIBC_2.38 pthread_rwlock_trywrlock F +GLIBC_2.38 pthread_rwlock_unlock F GLIBC_2.38 pthread_rwlockattr_destroy F GLIBC_2.38 pthread_rwlockattr_getpshared F GLIBC_2.38 pthread_rwlockattr_init F @@ -2271,6 +2272,7 @@ GLIBC_2.42 pthread_mutex_setprioceiling F GLIBC_2.42 pthread_mutex_trylock F GLIBC_2.42 pthread_rwlock_tryrdlock F GLIBC_2.42 pthread_rwlock_trywrlock F +GLIBC_2.42 pthread_rwlock_unlock F GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index b712a1b3bf..cd08c5f9c5 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -63,7 +63,6 @@ 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 -GLIBC_2.38 pthread_rwlock_unlock F GLIBC_2.38 pthread_rwlock_wrlock F GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setschedprio F From patchwork Sun Feb 16 23:03:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106651 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 1E96F3858D28 for ; Sun, 16 Feb 2025 23:05:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E96F3858D28 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 A1AE63858C98 for ; Sun, 16 Feb 2025 23:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A1AE63858C98 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 A1AE63858C98 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=r3LGwrMreEBbqJJve5mILWoPbBV12SMcriRLCF/jXpu7lvKJiXqwNZkpZ949/49bXe+7Ubaf3IOtFYkqtUIXr7BRm5W0gUI1Y7SeuZzWgHN7oEJuJwI/3GAZXkjtBGVuQICmnEnMIWQiBvTTftNj/Lrbk/MNPNrrlOr//8VNxj0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739747006; c=relaxed/simple; bh=Xu7GARKR4TFqc4ypQgsFPtWcWarIRXJemW3xs/zCChA=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=B+dogrJvbwef9d+JNalQPAmWcQHKBK76SE/oLZoS5gL1+GozBo3BR1Xkg05k3YbEU8FBi7v9aT9MO0n4o7W9Tosvgn4VE1rqDY479yfGzW5BrqrmA9lGnJCsSOC/QWyjK1TObieyU8fOjxvKXyk8NIdnIXfOqouHgB9nl17LXhU= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A1AE63858C98 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 56F38A1C43; 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 LV0GgHIosoXA; 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 732F3A1C89; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0ap-3bOv; 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 07/10] htl: move pthread_rwlock_{rdlock, timedrdlock, timedwrlock, wrlock, clockrdlock, clockwrlock} into libc. Date: Mon, 17 Feb 2025 00:03:07 +0100 Message-ID: <20250216230311.3097176-8-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-8-gfleury@disroot.org> --- htl/Makefile | 8 ++++---- htl/Versions | 18 +++++++++++++----- htl/pt-initialize.c | 2 -- sysdeps/htl/libc-lockP.h | 6 ++---- sysdeps/htl/pt-rwlock-rdlock.c | 8 +++++++- sysdeps/htl/pt-rwlock-timedrdlock.c | 16 +++++++++++++--- sysdeps/htl/pt-rwlock-timedwrlock.c | 16 +++++++++++++--- sysdeps/htl/pt-rwlock-wrlock.c | 9 +++++++-- sysdeps/htl/pthread-functions.h | 4 ---- sysdeps/htl/pthreadP.h | 12 ++++++++++++ sysdeps/mach/hurd/i386/libc.abilist | 12 ++++++++++++ sysdeps/mach/hurd/i386/libpthread.abilist | 6 ------ sysdeps/mach/hurd/x86_64/libc.abilist | 12 ++++++++++++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 6 ------ 14 files changed, 95 insertions(+), 40 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index d5ab98c840..85c7b61e99 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -47,10 +47,6 @@ libpthread-routines := \ pt-mutex-transfer-np \ pt-rwlock-init \ pt-rwlock-destroy \ - pt-rwlock-rdlock \ - pt-rwlock-wrlock \ - pt-rwlock-timedrdlock \ - pt-rwlock-timedwrlock \ pt-hurd-cond-wait \ pt-hurd-cond-timedwait \ pt-stack-alloc \ @@ -194,9 +190,13 @@ routines := \ pt-nthreads \ pt-pthread_self \ pt-rwlock-attr \ + pt-rwlock-rdlock \ + pt-rwlock-timedrdlock \ + pt-rwlock-timedwrlock \ pt-rwlock-tryrdlock \ pt-rwlock-trywrlock \ pt-rwlock-unlock \ + pt-rwlock-wrlock \ pt-rwlockattr-destroy \ pt-rwlockattr-getpshared \ pt-rwlockattr-init \ diff --git a/htl/Versions b/htl/Versions index 9669fe9dbc..4c4ceb102c 100644 --- a/htl/Versions +++ b/htl/Versions @@ -63,9 +63,13 @@ libc { pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_rwlock_rdlock; + pthread_rwlock_timedrdlock; + pthread_rwlock_timedwrlock; pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; + pthread_rwlock_wrlock; pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; @@ -109,6 +113,8 @@ libc { pthread_mutexattr_getrobust; pthread_mutexattr_getrobust_np; pthread_mutexattr_setrobust; pthread_mutexattr_setrobust_np; + + pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; } GLIBC_2.41 { @@ -149,6 +155,12 @@ libc { pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; pthread_mutex_trylock; + pthread_rwlock_clockrdlock; + pthread_rwlock_clockwrlock; + pthread_rwlock_rdlock; + pthread_rwlock_timedrdlock; + pthread_rwlock_timedwrlock; + pthread_rwlock_wrlock; pthread_rwlock_tryrdlock; pthread_rwlock_trywrlock; pthread_rwlock_unlock; @@ -251,9 +263,7 @@ libpthread { pthread_once; - pthread_rwlock_destroy; pthread_rwlock_init; pthread_rwlock_rdlock; - pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; - pthread_rwlock_wrlock; + pthread_rwlock_destroy; pthread_rwlock_init; pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; @@ -283,8 +293,6 @@ libpthread { cnd_broadcast; cnd_destroy; cnd_init; cnd_signal; cnd_timedwait; cnd_wait; tss_create; tss_delete; tss_get; tss_set; - pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; - pthread_tryjoin_np; pthread_timedjoin_np; pthread_clockjoin_np; sem_clockwait; diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 14172099d4..658ba1eaf3 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -30,8 +30,6 @@ static const struct pthread_functions pthread_functions = { .ptr___pthread_exit = __pthread_exit, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, .ptr_pthread_once = __pthread_once, - .ptr_pthread_rwlock_rdlock = __pthread_rwlock_rdlock, - .ptr_pthread_rwlock_wrlock = __pthread_rwlock_wrlock, .ptr___pthread_key_create = __pthread_key_create, .ptr___pthread_getspecific = __pthread_getspecific, .ptr___pthread_setspecific = __pthread_setspecific, diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 7e9bdd1c4b..ae2e4668bb 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -96,11 +96,13 @@ extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock, extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock); extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock); +libc_hidden_proto (__pthread_rwlock_rdlock) extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_tryrdlock) extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock); +libc_hidden_proto (__pthread_rwlock_wrlock) extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_trywrlock) @@ -123,8 +125,6 @@ libc_hidden_proto (__pthread_setcancelstate) # ifdef weak_extern weak_extern (__pthread_rwlock_init) weak_extern (__pthread_rwlock_destroy) -weak_extern (__pthread_rwlock_rdlock) -weak_extern (__pthread_rwlock_wrlock) weak_extern (__pthread_key_create) weak_extern (__pthread_setspecific) weak_extern (__pthread_getspecific) @@ -133,8 +133,6 @@ weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) # else # pragma weak __pthread_rwlock_destroy -# pragma weak __pthread_rwlock_rdlock -# pragma weak __pthread_rwlock_wrlock # pragma weak __pthread_key_create # pragma weak __pthread_setspecific # pragma weak __pthread_getspecific diff --git a/sysdeps/htl/pt-rwlock-rdlock.c b/sysdeps/htl/pt-rwlock-rdlock.c index a2f6e47b5c..15648a8459 100644 --- a/sysdeps/htl/pt-rwlock-rdlock.c +++ b/sysdeps/htl/pt-rwlock-rdlock.c @@ -18,6 +18,7 @@ #include #include +#include /* Implemented in pt-rwlock-timedrdlock.c. */ extern int __pthread_rwlock_timedrdlock_internal (struct __pthread_rwlock @@ -32,4 +33,9 @@ __pthread_rwlock_rdlock (struct __pthread_rwlock *rwlock) { return __pthread_rwlock_timedrdlock_internal (rwlock, -1, 0); } -weak_alias (__pthread_rwlock_rdlock, pthread_rwlock_rdlock); +libc_hidden_def (__pthread_rwlock_rdlock) +versioned_symbol (libc, __pthread_rwlock_rdlock, pthread_rwlock_rdlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_rdlock, pthread_rwlock_rdlock, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pt-rwlock-timedrdlock.c b/sysdeps/htl/pt-rwlock-timedrdlock.c index 3c900e6636..93874a1698 100644 --- a/sysdeps/htl/pt-rwlock-timedrdlock.c +++ b/sysdeps/htl/pt-rwlock-timedrdlock.c @@ -19,8 +19,8 @@ #include #include #include - #include +#include /* Acquire the rwlock *RWLOCK for reading blocking until *ABSTIME if it is already held. As a GNU extension, if TIMESPEC is NULL then @@ -122,7 +122,12 @@ __pthread_rwlock_timedrdlock (struct __pthread_rwlock *rwlock, { return __pthread_rwlock_timedrdlock_internal (rwlock, CLOCK_REALTIME, abstime); } -weak_alias (__pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock) +libc_hidden_def (__pthread_rwlock_timedrdlock) +versioned_symbol (libc, __pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_timedrdlock, pthread_rwlock_timedrdlock, GLIBC_2_12); +#endif int __pthread_rwlock_clockrdlock (struct __pthread_rwlock *rwlock, @@ -131,4 +136,9 @@ __pthread_rwlock_clockrdlock (struct __pthread_rwlock *rwlock, { return __pthread_rwlock_timedrdlock_internal (rwlock, clockid, abstime); } -weak_alias (__pthread_rwlock_clockrdlock, pthread_rwlock_clockrdlock) +libc_hidden_def (__pthread_rwlock_clockrdlock) +versioned_symbol (libc, __pthread_rwlock_clockrdlock, pthread_rwlock_clockrdlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_32, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_clockrdlock, pthread_rwlock_clockrdlock, GLIBC_2_32); +#endif diff --git a/sysdeps/htl/pt-rwlock-timedwrlock.c b/sysdeps/htl/pt-rwlock-timedwrlock.c index 3780119d71..bf3cc55ef6 100644 --- a/sysdeps/htl/pt-rwlock-timedwrlock.c +++ b/sysdeps/htl/pt-rwlock-timedwrlock.c @@ -19,8 +19,8 @@ #include #include #include - #include +#include /* Acquire RWLOCK for writing blocking until *ABSTIME if we cannot get it. As a special GNU extension, if ABSTIME is NULL then the wait @@ -105,7 +105,12 @@ __pthread_rwlock_timedwrlock (struct __pthread_rwlock *rwlock, { return __pthread_rwlock_timedwrlock_internal (rwlock, CLOCK_REALTIME, abstime); } -weak_alias (__pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock) +libc_hidden_def (__pthread_rwlock_timedwrlock) +versioned_symbol (libc, __pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock, GLIBC_2_12); +#endif int __pthread_rwlock_clockwrlock (struct __pthread_rwlock *rwlock, @@ -114,4 +119,9 @@ __pthread_rwlock_clockwrlock (struct __pthread_rwlock *rwlock, { return __pthread_rwlock_timedwrlock_internal (rwlock, clockid, abstime); } -weak_alias (__pthread_rwlock_clockwrlock, pthread_rwlock_clockwrlock) +libc_hidden_def (__pthread_rwlock_clockwrlock) +versioned_symbol (libc, __pthread_rwlock_clockwrlock, pthread_rwlock_clockwrlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_32, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_clockwrlock, pthread_rwlock_clockwrlock, GLIBC_2_32); +#endif diff --git a/sysdeps/htl/pt-rwlock-wrlock.c b/sysdeps/htl/pt-rwlock-wrlock.c index 181aa6a91f..ca0e5b02e5 100644 --- a/sysdeps/htl/pt-rwlock-wrlock.c +++ b/sysdeps/htl/pt-rwlock-wrlock.c @@ -18,8 +18,8 @@ #include #include - #include +#include /* Implemented in pt-rwlock-timedwrlock.c. */ extern int __pthread_rwlock_timedwrlock_internal (struct __pthread_rwlock @@ -34,4 +34,9 @@ __pthread_rwlock_wrlock (struct __pthread_rwlock *rwlock) { return __pthread_rwlock_timedwrlock_internal (rwlock, -1, 0); } -weak_alias (__pthread_rwlock_wrlock, pthread_rwlock_wrlock); +libc_hidden_def (__pthread_rwlock_wrlock) +versioned_symbol (libc, __pthread_rwlock_wrlock, pthread_rwlock_wrlock, GLIBC_2_42); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_wrlock, pthread_rwlock_wrlock, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 7dd6fadc17..467d0312e1 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -24,8 +24,6 @@ void __pthread_exit (void *) __attribute__ ((__noreturn__)); struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); int __pthread_once (pthread_once_t *, void (*) (void)); -int __pthread_rwlock_rdlock (pthread_rwlock_t *); -int __pthread_rwlock_wrlock (pthread_rwlock_t *); int __pthread_key_create (pthread_key_t *, void (*) (void *)); void *__pthread_getspecific (pthread_key_t); int __pthread_setspecific (pthread_key_t, const void *); @@ -42,8 +40,6 @@ struct pthread_functions void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__)); struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void); int (*ptr_pthread_once) (pthread_once_t *, void (*) (void)); - int (*ptr_pthread_rwlock_rdlock) (pthread_rwlock_t *); - int (*ptr_pthread_rwlock_wrlock) (pthread_rwlock_t *); int (*ptr___pthread_key_create) (pthread_key_t *, void (*) (void *)); void *(*ptr___pthread_getspecific) (pthread_key_t); int (*ptr___pthread_setspecific) (pthread_key_t, const void *); diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index d77cee51a5..9479b9ef24 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -114,6 +114,18 @@ 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_rwlock_clockrdlock (pthread_rwlock_t *__rwlock, + clockid_t __clockid, const struct timespec *__abstime); +libc_hidden_proto (__pthread_rwlock_clockrdlock) +extern int __pthread_rwlock_clockwrlock (pthread_rwlock_t *__rwlock, + clockid_t __clockid, const struct timespec *__abstime); +libc_hidden_proto (__pthread_rwlock_clockwrlock) +extern int __pthread_rwlock_timedrdlock (struct __pthread_rwlock *__rwlock, + const struct timespec *__abstime); +libc_hidden_proto (__pthread_rwlock_timedrdlock) +extern int __pthread_rwlock_timedwrlock (struct __pthread_rwlock *__rwlock, + const struct timespec *__abstime); +libc_hidden_proto (__pthread_rwlock_timedwrlock) extern int __pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr); libc_hidden_proto (__pthread_rwlockattr_destroy) extern int __pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__attr, diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 8df2a87d6a..7fd490912b 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -88,9 +88,13 @@ 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_rwlock_rdlock F +GLIBC_2.12 pthread_rwlock_timedrdlock F +GLIBC_2.12 pthread_rwlock_timedwrlock F GLIBC_2.12 pthread_rwlock_tryrdlock F GLIBC_2.12 pthread_rwlock_trywrlock F GLIBC_2.12 pthread_rwlock_unlock F +GLIBC_2.12 pthread_rwlock_wrlock F GLIBC_2.12 pthread_rwlockattr_destroy F GLIBC_2.12 pthread_rwlockattr_getpshared F GLIBC_2.12 pthread_rwlockattr_init F @@ -2294,6 +2298,8 @@ 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 sigabbrev_np F GLIBC_2.32 sigdescr_np F GLIBC_2.32 strerrordesc_np F @@ -2587,9 +2593,15 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F 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_rdlock F +GLIBC_2.42 pthread_rwlock_timedrdlock F +GLIBC_2.42 pthread_rwlock_timedwrlock F GLIBC_2.42 pthread_rwlock_tryrdlock F GLIBC_2.42 pthread_rwlock_trywrlock F GLIBC_2.42 pthread_rwlock_unlock F +GLIBC_2.42 pthread_rwlock_wrlock F GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 8ba641f611..1b4cfa5f1e 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -38,10 +38,6 @@ GLIBC_2.12 pthread_mutex_transfer_np F GLIBC_2.12 pthread_once 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 -GLIBC_2.12 pthread_rwlock_wrlock F GLIBC_2.12 pthread_setconcurrency F GLIBC_2.12 pthread_setschedprio F GLIBC_2.12 pthread_setspecific F @@ -83,8 +79,6 @@ GLIBC_2.32 mtx_timedlock F GLIBC_2.32 mtx_trylock F GLIBC_2.32 mtx_unlock F GLIBC_2.32 pthread_clockjoin_np F -GLIBC_2.32 pthread_rwlock_clockrdlock F -GLIBC_2.32 pthread_rwlock_clockwrlock F GLIBC_2.32 pthread_timedjoin_np F GLIBC_2.32 pthread_tryjoin_np F GLIBC_2.32 sem_clockwait F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 472c1b2ea8..dfda521360 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1579,9 +1579,15 @@ 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_rwlock_clockrdlock F +GLIBC_2.38 pthread_rwlock_clockwrlock F +GLIBC_2.38 pthread_rwlock_rdlock F +GLIBC_2.38 pthread_rwlock_timedrdlock F +GLIBC_2.38 pthread_rwlock_timedwrlock F GLIBC_2.38 pthread_rwlock_tryrdlock F GLIBC_2.38 pthread_rwlock_trywrlock F GLIBC_2.38 pthread_rwlock_unlock F +GLIBC_2.38 pthread_rwlock_wrlock F GLIBC_2.38 pthread_rwlockattr_destroy F GLIBC_2.38 pthread_rwlockattr_getpshared F GLIBC_2.38 pthread_rwlockattr_init F @@ -2270,9 +2276,15 @@ GLIBC_2.42 pthread_mutex_consistent_np F GLIBC_2.42 pthread_mutex_getprioceiling F GLIBC_2.42 pthread_mutex_setprioceiling F 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_rdlock F +GLIBC_2.42 pthread_rwlock_timedrdlock F +GLIBC_2.42 pthread_rwlock_timedwrlock F GLIBC_2.42 pthread_rwlock_tryrdlock F GLIBC_2.42 pthread_rwlock_trywrlock F GLIBC_2.42 pthread_rwlock_unlock F +GLIBC_2.42 pthread_rwlock_wrlock F GLIBC_2.42 pthread_rwlockattr_destroy F GLIBC_2.42 pthread_rwlockattr_getpshared F GLIBC_2.42 pthread_rwlockattr_init F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index cd08c5f9c5..32b0b50275 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -56,14 +56,8 @@ 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_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 -GLIBC_2.38 pthread_rwlock_wrlock F GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setschedprio F GLIBC_2.38 pthread_setspecific F From patchwork Sun Feb 16 23:03:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106652 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 1DF143858D3C for ; Sun, 16 Feb 2025 23:06:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1DF143858D3C 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 8B3653858D26 for ; Sun, 16 Feb 2025 23:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8B3653858D26 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 8B3653858D26 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=RWxkk7nGlbTNL7OxYA+rgII3V7BwzX2e1gYfailx8pTkIg1Smn/LrYP8GzVIAbotthEcVMnfJWc0ocThZ6J3k/LnpyIKQytEAH18qpxmgrNGgOFtt8za3Ng2xjmC3lXIQnO3vFJ/uzksxhI/jyLhEEQXS5N35Qg0ObrmChZp34w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739747006; c=relaxed/simple; bh=nAQ4Nr+C5YqvPmVoV7zgVDqWCBb1CSpvHJ/ecxm6j54=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=K1OhclNwVVG2bIItj7qD4z/KE0HDPd6a3CerbjBffHye/+8ISeOvz2kNf6T+bZiFRR18sq3ic/vbhLpRqocm7fACcAS0OIniFoC4fs2PCSBuFetZfInOAsUKtj7rRr0TNV1C+HYT6MNd7pG4FwfQzo4FtQtpdy8Et6z1rV18/Dw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B3653858D26 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 17008A1C3C; 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 FXk15nKD72vB; Mon, 17 Feb 2025 00:03:13 +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 664D6A1C3D; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0ba-3i0j; 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 08/10] htl: move pthread_rwlock_destroy into libc. Date: Mon, 17 Feb 2025 00:03:08 +0100 Message-ID: <20250216230311.3097176-9-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-9-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 6 ++++-- sysdeps/htl/libc-lockP.h | 3 +-- sysdeps/htl/pt-rwlock-destroy.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, 17 insertions(+), 9 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 85c7b61e99..78d997d4ab 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -46,7 +46,6 @@ libpthread-routines := \ pt-cancel \ pt-mutex-transfer-np \ pt-rwlock-init \ - pt-rwlock-destroy \ pt-hurd-cond-wait \ pt-hurd-cond-timedwait \ pt-stack-alloc \ @@ -190,6 +189,7 @@ routines := \ pt-nthreads \ pt-pthread_self \ pt-rwlock-attr \ + pt-rwlock-destroy \ pt-rwlock-rdlock \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ diff --git a/htl/Versions b/htl/Versions index 4c4ceb102c..f636e6ede5 100644 --- a/htl/Versions +++ b/htl/Versions @@ -63,6 +63,7 @@ libc { pthread_mutexattr_setprotocol; pthread_mutexattr_setpshared; pthread_mutexattr_settype; + pthread_rwlock_destroy; pthread_rwlock_rdlock; pthread_rwlock_timedrdlock; pthread_rwlock_timedwrlock; @@ -154,6 +155,7 @@ libc { pthread_mutex_consistent; pthread_mutex_consistent_np; pthread_mutex_getprioceiling; pthread_mutex_setprioceiling; + pthread_rwlock_destroy; pthread_mutex_trylock; pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; @@ -263,7 +265,7 @@ libpthread { pthread_once; - pthread_rwlock_destroy; pthread_rwlock_init; + pthread_rwlock_init; pthread_setconcurrency; pthread_setschedprio; pthread_setspecific; @@ -318,6 +320,6 @@ libpthread { __pthread_getattr_np; __pthread_enable_asynccancel; __pthread_disable_asynccancel; - _pthread_rwlock_destroy; _pthread_rwlock_init; + _pthread_rwlock_init; } } diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index ae2e4668bb..1b5c23ebac 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -94,6 +94,7 @@ extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr); extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock); +libc_hidden_proto (__pthread_rwlock_destroy) extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock); libc_hidden_proto (__pthread_rwlock_rdlock) @@ -124,7 +125,6 @@ libc_hidden_proto (__pthread_setcancelstate) #if !defined(__NO_WEAK_PTHREAD_ALIASES) && !IS_IN (libpthread) # ifdef weak_extern weak_extern (__pthread_rwlock_init) -weak_extern (__pthread_rwlock_destroy) weak_extern (__pthread_key_create) weak_extern (__pthread_setspecific) weak_extern (__pthread_getspecific) @@ -132,7 +132,6 @@ weak_extern (__pthread_once) weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) # else -# pragma weak __pthread_rwlock_destroy # pragma weak __pthread_key_create # pragma weak __pthread_setspecific # pragma weak __pthread_getspecific diff --git a/sysdeps/htl/pt-rwlock-destroy.c b/sysdeps/htl/pt-rwlock-destroy.c index 0f862c89a2..ffdd3c0187 100644 --- a/sysdeps/htl/pt-rwlock-destroy.c +++ b/sysdeps/htl/pt-rwlock-destroy.c @@ -18,11 +18,16 @@ #include #include +#include int -_pthread_rwlock_destroy (pthread_rwlock_t *rwlock) +__pthread_rwlock_destroy (pthread_rwlock_t *rwlock) { return 0; } +libc_hidden_def (__pthread_rwlock_destroy) +versioned_symbol (libc, __pthread_rwlock_destroy, pthread_rwlock_destroy, GLIBC_2_42); -strong_alias (_pthread_rwlock_destroy, pthread_rwlock_destroy); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_42) +compat_symbol (libpthread, __pthread_rwlock_destroy, pthread_rwlock_destroy, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 7fd490912b..e96b22bde4 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -88,6 +88,7 @@ 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_rwlock_destroy F GLIBC_2.12 pthread_rwlock_rdlock F GLIBC_2.12 pthread_rwlock_timedrdlock F GLIBC_2.12 pthread_rwlock_timedwrlock F @@ -2595,6 +2596,7 @@ GLIBC_2.42 pthread_mutex_setprioceiling F 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_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 1b4cfa5f1e..3ebfa63738 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_destroy F GLIBC_2.12 pthread_rwlock_init F GLIBC_2.12 pthread_setconcurrency F GLIBC_2.12 pthread_setschedprio F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index dfda521360..f5559a16fa 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1581,6 +1581,7 @@ GLIBC_2.38 pthread_mutexattr_setrobust_np F 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_rdlock F GLIBC_2.38 pthread_rwlock_timedrdlock F GLIBC_2.38 pthread_rwlock_timedwrlock F @@ -2278,6 +2279,7 @@ GLIBC_2.42 pthread_mutex_setprioceiling F 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_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 32b0b50275..106aa09d8a 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_destroy F GLIBC_2.38 pthread_rwlock_init F GLIBC_2.38 pthread_setconcurrency F GLIBC_2.38 pthread_setschedprio F 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 From patchwork Sun Feb 16 23:03:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 106650 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 32D113858C54 for ; Sun, 16 Feb 2025 23:05:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 32D113858C54 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 8C8A73858D28 for ; Sun, 16 Feb 2025 23:03:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C8A73858D28 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 8C8A73858D28 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=GNnnyBWf1aw4XAwySYlYVTy13sQ1Dr6dI8PP2wRms7Q63vSxTMjybMIbOaVnK5YRpo5uvQkVUSQ0qx7dtZ/JzNIPYCQrfO2VrtOrZvSfPr9rzTUs4SwgoQV7UNI2KyoAowNdjsC2bGyAM7IvBaVEYFmEjWp7NHkfyhP4WNW4wxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1739747006; c=relaxed/simple; bh=Q3/v6TlCXkiIl2gS5/yGvxrIRdEDO/zon05wdjPuQZI=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=tDeN7XjMJUowhLOcM8N2575ioWFIvbOIHx19DuunO1M68j8WD6np4Ao6sSCTxw4a2ZuJPOvyHTA9CGCePtTCRTghStUL8W154qkaebP9eGV3rD/UsXz2zzQEt+uAE6eaOYiNtM+Qn6Mddlx1O8P4V08a8ySENSQvXIFhq4bqwPM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8C8A73858D28 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 3CF8FA1C38; 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 Pfh_THOQY7G4; 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 724E9A1C4E; Mon, 17 Feb 2025 00:03:13 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tjnfM-0000000D0cz-3v5E; 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 10/10] htl: don't export __pthread_default_rwlockattr anymore. Date: Mon, 17 Feb 2025 00:03:10 +0100 Message-ID: <20250216230311.3097176-11-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 since now all symbloy that use it are in libc Message-ID: <20250216145434.7089-11-gfleury@disroot.org> --- htl/Versions | 1 - htl/pt-internal.h | 1 - sysdeps/htl/pt-rwlock-attr.c | 1 - 3 files changed, 3 deletions(-) diff --git a/htl/Versions b/htl/Versions index 4fe2a45295..3d2cb4e7a4 100644 --- a/htl/Versions +++ b/htl/Versions @@ -201,7 +201,6 @@ libc { __pthread_cond_wait; __pthread_condattr_init; __pthread_default_condattr; - __pthread_default_rwlockattr; __pthread_mutex_checklocked; __pthread_mutex_destroy; __pthread_mutex_init; diff --git a/htl/pt-internal.h b/htl/pt-internal.h index cd4ebc0a6a..d19579b33b 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -331,7 +331,6 @@ extern const struct __pthread_barrierattr __pthread_default_barrierattr; /* Default rdlock attributes. */ extern const struct __pthread_rwlockattr __pthread_default_rwlockattr; -libc_hidden_proto (__pthread_default_rwlockattr) /* Default condition attributes. */ extern const struct __pthread_condattr __pthread_default_condattr; diff --git a/sysdeps/htl/pt-rwlock-attr.c b/sysdeps/htl/pt-rwlock-attr.c index 98dd4c9d69..999e108ecf 100644 --- a/sysdeps/htl/pt-rwlock-attr.c +++ b/sysdeps/htl/pt-rwlock-attr.c @@ -22,4 +22,3 @@ const struct __pthread_rwlockattr __pthread_default_rwlockattr = { __pshared: PTHREAD_PROCESS_PRIVATE }; -libc_hidden_data_def (__pthread_default_rwlockattr)