From patchwork Tue Nov 26 20:53:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 101926 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 B4E423858D37 for ; Tue, 26 Nov 2024 20:59:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4E423858D37 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=hR5wpciD 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 8A0EC3858CDA for ; Tue, 26 Nov 2024 20:57:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8A0EC3858CDA 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 8A0EC3858CDA 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=1732654644; cv=none; b=w6tXTc4Gy+DFgfO1lhDSu5jrF1XDRYk7RMqJLeYaUgEycWZbSssVrrw00lRVnK7yC5OcM5ypR7GGDF/sB27hCBS7Eb7/We96TQ80tcFbCo5OrguCtajx0ImqpVQ8x63OR6CViIj9DPvtGy3QJI0BkbW7vryFnZkFeJgdey6aYNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732654644; c=relaxed/simple; bh=HQ1J0zxlZm/gCs9KWx/tNYqNBNUoMHt3Zi1jOZdbl3g=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=LkT8SYlz3NfjiV+3QEeQ+jsDg81zhcyvTmj8TmzvRbABDgqXrRKdjakXpQWUMziU0YPwLrxaUZt5F5zsgxkDLdaiZZY2qheveOj7DPRgjS5fOO3DysOlhi/zLRq3q4NeFwEPpLoIL7rhov2Jfdw844j8hB8IpdUFUf9+HU/U88Q= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A0EC3858CDA Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7851124EDF; Tue, 26 Nov 2024 21:57:23 +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 FK6YtxMu72ng; Tue, 26 Nov 2024 21:57:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1732654642; bh=HQ1J0zxlZm/gCs9KWx/tNYqNBNUoMHt3Zi1jOZdbl3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hR5wpciDRrBZcXMcfOPAi3JfQYf0Xja68qBmM0kbkGal+uESlT/bxsDCYrJbXupH6 hKRBQMp7cVa98HBw53PfMRgdmFO3kvHRtPat6quhnamhX1YhAomhLI8+bN1BHu107y F64PbUg1u7meIsJNhvtgc8nuw7Q+P5Kk0qQAsa9eZhH3rp4WaMRLR0FEtjTCE0K8yz 78g1zDmiQCeqUL2J1kytyzq1H1czcEfrC3Zv0zxUrdwi3gcPoe21dc2hFkwlvudP5e 7g+hQmf4zhlmtoX2RRB0FM/adIJviTG1sEHe52DU/orZbxmXdvZyQrCcTjxl8N3XDq 60u8pnm6tv1gQ== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 4/7] htl: move pthread_condattr_getpshared into libc. Date: Tue, 26 Nov 2024 22:53:26 +0200 Message-Id: <20241126205329.2215295-5-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 | 4 +++- sysdeps/htl/pt-condattr-getpshared.c | 8 +++++++- 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, 15 insertions(+), 5 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index ef01902c..60a28e0c 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -93,7 +93,6 @@ libpthread-routines := \ pt-rwlock-timedwrlock \ pt-rwlock-unlock \ pt-condattr-init \ - pt-condattr-getpshared \ pt-condattr-setclock \ pt-condattr-setpshared \ pt-cond-destroy \ @@ -206,6 +205,7 @@ routines := \ pt-cond \ pt-condattr-destroy \ pt-condattr-getclock \ + pt-condattr-getpshared \ pt-getschedparam \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index 887703ef..33106014 100644 --- a/htl/Versions +++ b/htl/Versions @@ -28,6 +28,7 @@ libc { pthread_attr_init; pthread_condattr_getclock; pthread_condattr_destroy; + pthread_condattr_getpshared; } GLIBC_2.21 { @@ -67,6 +68,7 @@ libc { pthread_attr_setstack; pthread_attr_setguardsize; pthread_condattr_getclock; + pthread_condattr_getpshared; } @@ -123,7 +125,7 @@ libpthread { pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; - pthread_condattr_getpshared; pthread_condattr_init; + pthread_condattr_init; pthread_condattr_setclock; pthread_condattr_setpshared; pthread_create; pthread_detach; pthread_exit; diff --git a/sysdeps/htl/pt-condattr-getpshared.c b/sysdeps/htl/pt-condattr-getpshared.c index 7aea9e6e..90e9c488 100644 --- a/sysdeps/htl/pt-condattr-getpshared.c +++ b/sysdeps/htl/pt-condattr-getpshared.c @@ -17,11 +17,17 @@ . */ #include +#include #include int -pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared) +__pthread_condattr_getpshared (const pthread_condattr_t *attr, int *pshared) { *pshared = attr->__pshared; return 0; } +versioned_symbol (libpthread, __pthread_condattr_getpshared, pthread_condattr_getpshared, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_condattr_getpshared, pthread_condattr_getpshared, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 72c09131..de6db602 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -51,6 +51,7 @@ 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_condattr_getpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_self F @@ -2506,6 +2507,7 @@ 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.41 pthread_condattr_getpshared 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 819e74ab..6a1e221e 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_getpshared F GLIBC_2.12 pthread_condattr_init F GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index c070d6c4..9a549053 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1539,6 +1539,7 @@ 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_getpshared F GLIBC_2.38 pthread_condattr_init F GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F @@ -2202,6 +2203,7 @@ 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.41 pthread_condattr_getpshared 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 6397cd5f..ae4480ca 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_getpshared F GLIBC_2.38 pthread_condattr_init F GLIBC_2.38 pthread_condattr_setclock F GLIBC_2.38 pthread_condattr_setpshared F