From patchwork Mon Dec 9 01:26:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 102640 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 BEF963858420 for ; Mon, 9 Dec 2024 01:27:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BEF963858420 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 7E1443858415 for ; Mon, 9 Dec 2024 01:26:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7E1443858415 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 7E1443858415 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=1733707587; cv=none; b=gbhJi6PVNTLbcVtziyuvkB/XRYNE6hLwx4eEdbpuB8/d8O6fTOHh9hKwQ04+zqsg4c2Y1t5GDxcp7ELTeMThiX1gRoDfzaTvlwOiYnvksu/PQfqlItq7hlYLRL2sKpeR3OjPx1YP4XMcN37VNpUVlowKjp8th4WvxhqN0fZ8HP0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1733707587; c=relaxed/simple; bh=6IEF/DLQKaaxcj9968YU20IZDyvA5Ffl0Rv6HksmFKU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=t06vuUaZv38C6d02pVLViWYdePpxyhqtLayBj6ougwBOzzBI3TNV0BbvJzymbfRh02CO8wjLUtD3DE6sgjOgTnhIzx29LkImXM/lYfzvr18R/hZ5c/LvtjjHHmxEZjLgeCfrDnz55wRTAps+EI76ORgdq6CgF0uE+Tz0zGtsFEk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E1443858415 Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id 7ABA2A2136; Mon, 9 Dec 2024 02:26:25 +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 C3WrMEq-gyiu; Mon, 9 Dec 2024 02:26:25 +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 51DEAA1D27; Mon, 9 Dec 2024 02:26:25 +0100 (CET) Received: from samy by begin with local (Exim 4.98) (envelope-from ) id 1tKSXY-0000000B0kW-3Gxo; Mon, 09 Dec 2024 02:26:24 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: gfleury , commit-hurd@gnu.org Subject: [hurd,commited] htl: move pthread_condattr_getclock into libc. Date: Mon, 9 Dec 2024 02:26:24 +0100 Message-ID: <20241209012624.2624481-1-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: gfleury Signed-off-by: gfleury Message-ID: <20241126205329.2215295-4-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 3 ++- sysdeps/htl/pt-condattr-getclock.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 - 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 5f9b2ba24d..ef01902c3c 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -93,7 +93,6 @@ libpthread-routines := \ pt-rwlock-timedwrlock \ pt-rwlock-unlock \ pt-condattr-init \ - pt-condattr-getclock \ pt-condattr-getpshared \ pt-condattr-setclock \ pt-condattr-setpshared \ @@ -206,6 +205,7 @@ routines := \ pt-attr-setstacksize \ pt-cond \ pt-condattr-destroy \ + pt-condattr-getclock \ pt-getschedparam \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index 7aa8a1fef7..887703ef98 100644 --- a/htl/Versions +++ b/htl/Versions @@ -26,6 +26,7 @@ libc { pthread_attr_setscope; pthread_attr_setschedparam; pthread_attr_init; + pthread_condattr_getclock; pthread_condattr_destroy; } @@ -65,6 +66,7 @@ libc { pthread_attr_setstackaddr; pthread_attr_setstack; pthread_attr_setguardsize; + pthread_condattr_getclock; } @@ -121,7 +123,6 @@ libpthread { pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; - pthread_condattr_getclock; pthread_condattr_getpshared; pthread_condattr_init; pthread_condattr_setclock; pthread_condattr_setpshared; diff --git a/sysdeps/htl/pt-condattr-getclock.c b/sysdeps/htl/pt-condattr-getclock.c index a1ac71b038..cea53f484f 100644 --- a/sysdeps/htl/pt-condattr-getclock.c +++ b/sysdeps/htl/pt-condattr-getclock.c @@ -17,13 +17,18 @@ . */ #include +#include #include - #include int -pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t * clock) +__pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t * clock) { *clock = attr->__clock; return 0; } +versioned_symbol (libc, __pthread_condattr_getclock, pthread_condattr_getclock, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_condattr_getclock, pthread_condattr_getclock, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 5069319b59..72c09131ac 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -50,6 +50,7 @@ GLIBC_2.12 pthread_attr_setstack F GLIBC_2.12 pthread_attr_setstackaddr F GLIBC_2.12 pthread_attr_setstacksize F GLIBC_2.12 pthread_condattr_destroy F +GLIBC_2.12 pthread_condattr_getclock F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_self F @@ -2504,6 +2505,7 @@ GLIBC_2.41 pthread_attr_setguardsize F GLIBC_2.41 pthread_attr_setstack F GLIBC_2.41 pthread_attr_setstackaddr F GLIBC_2.41 pthread_attr_setstacksize F +GLIBC_2.41 pthread_condattr_getclock 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 7000b009ed..819e74abd1 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F GLIBC_2.12 pthread_cond_signal F GLIBC_2.12 pthread_cond_timedwait F GLIBC_2.12 pthread_cond_wait F -GLIBC_2.12 pthread_condattr_getclock F GLIBC_2.12 pthread_condattr_getpshared F GLIBC_2.12 pthread_condattr_init F GLIBC_2.12 pthread_condattr_setclock F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index f147fcb5c2..c070d6c4ee 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1538,6 +1538,7 @@ GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_wait F GLIBC_2.38 pthread_condattr_destroy F +GLIBC_2.38 pthread_condattr_getclock F GLIBC_2.38 pthread_condattr_init F GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F @@ -2200,6 +2201,7 @@ GLIBC_2.41 pthread_attr_setguardsize F GLIBC_2.41 pthread_attr_setstack F GLIBC_2.41 pthread_attr_setstackaddr F GLIBC_2.41 pthread_attr_setstacksize F +GLIBC_2.41 pthread_condattr_getclock 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 91da561235..6397cd5fe5 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_wait F -GLIBC_2.38 pthread_condattr_getclock F GLIBC_2.38 pthread_condattr_getpshared F GLIBC_2.38 pthread_condattr_init F GLIBC_2.38 pthread_condattr_setclock F