From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id C74083858401 for ; Sat, 29 Oct 2022 16:16:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C74083858401 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9090E40795; Sat, 29 Oct 2022 18:16:14 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id BGZQ74OLJWr5; Sat, 29 Oct 2022 18:16:13 +0200 (CEST) From: Guy-Fleury Iteriteka DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1667060168; bh=PAAbfJNpIR+nqivwovZ61CVMsLtn1QSI6AHYnkcpetA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TxfVAuguIagMI+tLrEidxsAwFeiOJJvTORGlsTlK8T8IprLsU2KqdGXbL/EYBIg/4 Q9IGyUgwDK/LzKxTDsUrzwnC1oeQ/r1MeuzXD7oDerEh5Su54lHelNn6DW7xcLdZz5 YzwO0O55SWj4FpGQpL79YAQeM/kYETCEerh9OG0Ug5W7Ir60GpuVE3fF/KHcQCswIW K0c8QlVFhmp08zZALkIp01O5vT1A4IFB7PV/3FhGpw29/0KCI5JqzOSoXGChC7T0t1 2Dn/4rqgUAT5BQX3wYAKxN/JIULF1TgtQCJwFwdRCCAyk7qyiDUCnwQ8KJkPRSTegm ujf8RqslML42g== To: libc-alpha@sourceware.org Cc: Guy-Fleury Iteriteka Subject: [PATCH 4/4] htl: move pthread_self into libc Date: Sat, 29 Oct 2022 13:00:30 +0100 Message-Id: <20221029120030.1448-5-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00,DATE_IN_PAST_03_06,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: --- htl/Makefile | 3 +-- htl/Versions | 7 +++---- htl/forward.c | 4 ---- htl/pt-initialize.c | 1 - sysdeps/htl/pthread-functions.h | 2 -- sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/mach/hurd/i386/libpthread.abilist | 1 - 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index a7b013ec..57bb22a2 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -51,7 +51,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-exit \ pt-initialize \ pt-join \ - pt-self \ pt-sigmask \ pt-spin-inlines \ pt-cleanup \ @@ -164,7 +163,7 @@ headers := \ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \ - pt-dep-self pt-equal + pt-dep-self pt-equal pt-self shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 1ef8a6d0..59070181 100644 --- a/htl/Versions +++ b/htl/Versions @@ -25,7 +25,9 @@ libc { GLIBC_2.32 { thrd_current; thrd_equal; thrd_sleep; thrd_yield; } - + GLIBC_2.36 { + __pthread_self; + } GLIBC_PRIVATE { __libc_alloca_cutoff; __libc_pthread_init; @@ -119,9 +121,6 @@ libpthread { pthread_rwlockattr_destroy; pthread_rwlockattr_getpshared; pthread_rwlockattr_init; pthread_rwlockattr_setpshared; - pthread_self; - __pthread_self; - pthread_setcancelstate; pthread_setcanceltype; pthread_setconcurrency; pthread_setschedparam; pthread_setschedprio; pthread_setspecific; diff --git a/htl/forward.c b/htl/forward.c index d0f775a2..41985f14 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -126,10 +126,6 @@ FORWARD (pthread_mutex_lock, (pthread_mutex_t *mutex), (mutex), 0) FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0) - -FORWARD2 (pthread_self, pthread_t, (void), (), return 0) - - FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate), 0) strong_alias (__pthread_setcancelstate, pthread_setcancelstate); diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 1d948c40..225736fe 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -55,7 +55,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_mutex_lock = __pthread_mutex_lock, .ptr_pthread_mutex_trylock = __pthread_mutex_trylock, .ptr_pthread_mutex_unlock = __pthread_mutex_unlock, - .ptr_pthread_self = __pthread_self, .ptr___pthread_setcancelstate = __pthread_setcancelstate, .ptr_pthread_setcanceltype = __pthread_setcanceltype, .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 095a61e6..4d9896ea 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -55,7 +55,6 @@ int _pthread_mutex_init (pthread_mutex_t *, int __pthread_mutex_lock (pthread_mutex_t *); int __pthread_mutex_trylock (pthread_mutex_t *); int __pthread_mutex_unlock (pthread_mutex_t *); -pthread_t __pthread_self (void); int __pthread_setcancelstate (int, int *); int __pthread_setcanceltype (int, int *); struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); @@ -110,7 +109,6 @@ struct pthread_functions int (*ptr_pthread_mutex_lock) (pthread_mutex_t *); int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *); int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *); - pthread_t (*ptr_pthread_self) (void); int (*ptr___pthread_setcancelstate) (int, int *); int (*ptr_pthread_setcanceltype) (int, int *); struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void); diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 26552958..bfa47282 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -29,6 +29,7 @@ GLIBC_2.11 mkostemps64 F GLIBC_2.11 mkstemps F GLIBC_2.11 mkstemps64 F GLIBC_2.12 pthread_equal F +GLIBC_2.12 pthread_self F GLIBC_2.13 __fentry__ F GLIBC_2.14 syncfs F GLIBC_2.15 __fdelt_chk F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 84f2643b..d15ba070 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -108,7 +108,6 @@ 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 GLIBC_2.12 pthread_setconcurrency F -- 2.37.2