From patchwork Tue Nov 26 20:53:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gfleury X-Patchwork-Id: 101931 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 99B13385829B for ; Tue, 26 Nov 2024 21:04:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 99B13385829B 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=QBqbKVos 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 901503858C3A for ; Tue, 26 Nov 2024 20:57:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 901503858C3A 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 901503858C3A 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=1732654652; cv=none; b=jR5boEjfu5NZ47ptf1hi7cpo95aQuQsobXNlb4sfeHwIhhbGd4S9yDkqUL+DIpUQPvKo81rwOnV9W6rinPRO1R9PvJ/dERkY/bMdZLgLDd4N70jTrIMcrP2AXc79o2HAIaiY/LYbpMoU6UGmsn6Regtday6ybTVL//8I+VUNU1Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1732654652; c=relaxed/simple; bh=j0tfzkCjzcCqI9Rxo5AxbGFmAc6/G7cOuwZaI3+1wv4=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=cJ60D7zaaXdMkbJOiAW7JnFXXLTZjZQpKQtPSATlzzlUaZT6810XCp8+JtnoMk2T7A710Dj/2+4xqrBcbvGkXYo54fXtT35EhY6QpDgxIQofl4YNxNIIBEX1n8taIHkDg1L3qOMk+VcLQq1R743HtBd+vLpGQF08YgTyCv+JcS8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 901503858C3A Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7F6A624F45; Tue, 26 Nov 2024 21:57:31 +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 X4rWFrXnTXDh; Tue, 26 Nov 2024 21:57:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1732654647; bh=j0tfzkCjzcCqI9Rxo5AxbGFmAc6/G7cOuwZaI3+1wv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QBqbKVosmaEBCZhRJHR5niLf3Ke2o4cTA00LbfRcXZi6Y+4wrjv9XwL0F9TctWpbm yELuyFWa6q61/wP/PvgD1rUfjwZT0wJPwwv+Hw+JAxqWHlT5OPpv8Lx/489NSnaFhK NgZjDmfSq44cWc5z+OWuKFCF/fEq66VFFQRlhDvAZR3hJXw/iFd4lDKZ74RclhwocL KHegRPhRzm10VpErRSPmqDI7datkS1PclONW/4sDYmntKosPuQej72C83mW/WGV3Vf ztmfLeBfzhno0GzHThGTlzGh/891xEoGHd6cx9CagZTlO1TKr2DpX/AZ7C74ghb901 MBU+ZFfM3ebUw== From: gfleury To: libc-alpha@sourceware.org Cc: gfleury Subject: [PATCH 7/7] htl: move pthread_condattr_setpshared into libc. Date: Tue, 26 Nov 2024 22:53:29 +0200 Message-Id: <20241126205329.2215295-8-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.8 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-setpshared.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, 14 insertions(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 56424aee..b0bc0d97 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -92,7 +92,6 @@ libpthread-routines := \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ pt-rwlock-unlock \ - pt-condattr-setpshared \ pt-cond-destroy \ pt-cond-init \ pt-cond-brdcast \ @@ -206,6 +205,7 @@ routines := \ pt-condattr-getpshared \ pt-condattr-init \ pt-condattr-setclock \ + pt-condattr-setpshared \ pt-getschedparam \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index 533b871e..33a3cfa7 100644 --- a/htl/Versions +++ b/htl/Versions @@ -31,6 +31,7 @@ libc { pthread_condattr_destroy; pthread_condattr_getpshared; pthread_condattr_setclock; + pthread_condattr_setpshared; } GLIBC_2.21 { @@ -72,6 +73,7 @@ libc { pthread_condattr_getclock; pthread_condattr_getpshared; pthread_condattr_setclock; + pthread_condattr_setpshared; } @@ -129,8 +131,6 @@ libpthread { pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; - pthread_condattr_setpshared; - pthread_create; pthread_detach; pthread_exit; pthread_getattr_np; diff --git a/sysdeps/htl/pt-condattr-setpshared.c b/sysdeps/htl/pt-condattr-setpshared.c index c78906d2..e8c87304 100644 --- a/sysdeps/htl/pt-condattr-setpshared.c +++ b/sysdeps/htl/pt-condattr-setpshared.c @@ -17,10 +17,11 @@ . */ #include +#include #include int -pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared) +__pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared) { switch (pshared) { @@ -36,3 +37,8 @@ pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared) } } stub_warning (pthread_condattr_setpshared) +versioned_symbol (libc, __pthread_condattr_setpshared, pthread_condattr_setpshared, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_condattr_setpshared, pthread_condattr_setpshared, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index a2cc5742..76ded62c 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -54,6 +54,7 @@ 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 +GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_self F @@ -2511,6 +2512,7 @@ GLIBC_2.41 pthread_attr_setstacksize F GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F +GLIBC_2.41 pthread_condattr_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 cd398f2f..72cb549b 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_setpshared F GLIBC_2.12 pthread_create F GLIBC_2.12 pthread_detach F GLIBC_2.12 pthread_exit F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 2ff7027d..c2ee0b1c 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1542,6 +1542,7 @@ 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 +GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getschedparam F @@ -2206,6 +2207,7 @@ GLIBC_2.41 pthread_attr_setstacksize F GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F +GLIBC_2.41 pthread_condattr_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 aa8f7802..bdadfd76 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_setpshared F GLIBC_2.38 pthread_create F GLIBC_2.38 pthread_detach F GLIBC_2.38 pthread_exit F