From patchwork Tue Nov 26 20:53:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 101929 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 5ABBA3858C50 for ; Tue, 26 Nov 2024 21:01:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5ABBA3858C50 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=disroot.org header.i=@disroot.org header.a=rsa-sha256 header.s=mail header.b=hFOVerlp X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id AECEB3858C32 for ; Tue, 26 Nov 2024 20:57:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AECEB3858C32 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AECEB3858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=178.21.23.139 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732654646; cv=none; b=R+7umIukX8ypZ7OAMzpMGvb4taVWodWa9rZDqZ3Iu8XuWsvT0ABzpyqKTXqEUeoVxcPdDalo7u9fZFZ7aRY08cpJBwnAih1xlHtvJ6vZ/hMb44e31Z3KHT/K88PX2o40GAxivbqIZv3LxFBhhHRV0HPsO3saUL8qQ9DrJPB+hUo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732654646; c=relaxed/simple; bh=MBTirRqvgCQtjAnqQ/qKfccH7/kiJ51ZkEIaiDkXim8=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=W5e3JtRfcDgSuqE0sWjTLaqNN+fkBJ3DfSDLbdDwKI/X9tLwBr0KEnEKwPkZnt58l3Tj97IMb4XaJww0fhDwY/3a/HNc2I0wDRmNQPnhq66nqbwHsEv6JjRL/FG6+9y6l79tqvf5GOJyLtlv4n93yqDcQiyRSTqp0EgExQfryZc= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AECEB3858C32 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2490524F00; Tue, 26 Nov 2024 21:57:25 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tzFnJYFLIbVa; Tue, 26 Nov 2024 21:57:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1732654640; bh=MBTirRqvgCQtjAnqQ/qKfccH7/kiJ51ZkEIaiDkXim8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hFOVerlpn8kEL54MZ4ZQeVZNK0FOi6+sIAE2aj9LCZIJqq6dpctzFrmB5GVQX4Qsm UuhBj7ofAs6SXLiuIlXEgI2NLwgMeEoYQOsazWxD/98xUjF0fiattsVfXQ2dEDJRpe Hakp5LcASxeaao0O7fLQRhCTirwqEGQDD6hWYWt7ESxfRnrZal1/OoCH2Ao0xpmzQX gFcwIfuqwWaGnYBoYtGhPBXnzh1VyWZLvGhbi8/brwgjmwhIFJyN4w7By7aXoK8Lap FmeMzBDaMDOKd/HgH/1iMLCnzrZ760E/fjeag2nZ5bOS9FS1SsBcGaClnSTQ3dLUzk Mso/VACwAglVg== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 3/7] htl: move pthread_condattr_getclock into libc. Date: Tue, 26 Nov 2024 22:53:25 +0200 Message-Id: <20241126205329.2215295-4-gfleury@disroot.org> In-Reply-To: <20241126205329.2215295-1-gfleury@disroot.org> References: <20241126205329.2215295-1-gfleury@disroot.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Signed-off-by: gfleury --- 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 5f9b2ba2..ef01902c 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 7aa8a1fe..887703ef 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 a1ac71b0..e3c6cb96 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 (libpthread, __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 5069319b..72c09131 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 7000b009..819e74ab 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 f147fcb5..c070d6c4 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 91da5612..6397cd5f 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