From patchwork Sat Oct 29 12:00:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guy-Fleury Iteriteka X-Patchwork-Id: 59629 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 EA7843858005 for ; Sat, 29 Oct 2022 16:17:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA7843858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667060246; bh=iVTRqLyeq50ZRwyyY5sUAb45WByIqaMGKJvJBlu30Gk=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=kIni055y4WK+8/F4hsWPB8cxMnPDVYMDMttSm1yjNYDmmLtytys63tsLqR6Ea3yWT mAUSDJGGdYdkrm5/P6/1628m6p0UA9kbCT0+xyLwi0sbxslzMEBLXioEpyekjQMgmp /kXoFXpyRJLfF67R5Lyjuly2A5YXnQz14fchgKbY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id E965B385841E for ; Sat, 29 Oct 2022 16:16:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E965B385841E Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B5E3D40B23; Sat, 29 Oct 2022 18:16:12 +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 AOWCfpP_q1yT; Sat, 29 Oct 2022 18:16:11 +0200 (CEST) To: libc-alpha@sourceware.org Subject: [PATCH 3/4] htl: move pthread_equal into libc Date: Sat, 29 Oct 2022 13:00:29 +0100 Message-Id: <20221029120030.1448-4-gfleury@disroot.org> In-Reply-To: <20221029120030.1448-1-gfleury@disroot.org> References: <20221029120030.1448-1-gfleury@disroot.org> Mime-Version: 1.0 X-Spam-Status: No, score=-11.8 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Guy-Fleury Iteriteka via Libc-alpha From: Guy-Fleury Iteriteka Reply-To: Guy-Fleury Iteriteka Cc: Guy-Fleury Iteriteka Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- htl/Makefile | 3 +-- htl/Versions | 2 +- 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, 3 insertions(+), 11 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 72e37fbd..a7b013ec 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -46,7 +46,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-alloc \ pt-create \ pt-getattr \ - pt-equal \ pt-dealloc \ pt-detach \ pt-exit \ @@ -165,7 +164,7 @@ headers := \ distribute := routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \ - pt-dep-self + pt-dep-self pt-equal shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 9ec84811..1ef8a6d0 100644 --- a/htl/Versions +++ b/htl/Versions @@ -83,7 +83,7 @@ libpthread { pthread_condattr_getpshared; pthread_condattr_init; pthread_condattr_setclock; pthread_condattr_setpshared; - pthread_create; pthread_detach; pthread_equal; pthread_exit; + pthread_create; pthread_detach; pthread_exit; pthread_getattr_np; diff --git a/htl/forward.c b/htl/forward.c index 00527348..d0f775a2 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -102,10 +102,6 @@ FORWARD (pthread_cond_timedwait, (pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime), (cond, mutex, abstime), 0) -FORWARD (pthread_equal, (pthread_t thread1, pthread_t thread2), - (thread1, thread2), 1) - - /* Use an alias to avoid warning, as pthread_exit is declared noreturn. */ FORWARD_NORETURN (__pthread_exit, void, (void *retval), (retval), exit (EXIT_SUCCESS)) diff --git a/htl/pt-initialize.c b/htl/pt-initialize.c index 02e6ad6b..1d948c40 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -47,7 +47,6 @@ static const struct pthread_functions pthread_functions = { .ptr_pthread_cond_signal = __pthread_cond_signal, .ptr_pthread_cond_wait = __pthread_cond_wait, .ptr_pthread_cond_timedwait = __pthread_cond_timedwait, - .ptr_pthread_equal = __pthread_equal, .ptr___pthread_exit = __pthread_exit, .ptr_pthread_getschedparam = __pthread_getschedparam, .ptr_pthread_setschedparam = __pthread_setschedparam, diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index ccccc8e5..095a61e6 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -45,7 +45,6 @@ int __pthread_cond_signal (pthread_cond_t *); int __pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *); int __pthread_cond_timedwait (pthread_cond_t *, pthread_mutex_t *, const struct timespec *); -int __pthread_equal (pthread_t, pthread_t); void __pthread_exit (void *) __attribute__ ((__noreturn__)); int __pthread_getschedparam (pthread_t, int *, struct sched_param *); int __pthread_setschedparam (pthread_t, int, @@ -101,7 +100,6 @@ struct pthread_functions int (*ptr_pthread_cond_wait) (pthread_cond_t *, pthread_mutex_t *); int (*ptr_pthread_cond_timedwait) (pthread_cond_t *, pthread_mutex_t *, const struct timespec *); - int (*ptr_pthread_equal) (pthread_t, pthread_t); void (*ptr___pthread_exit) (void *) __attribute__ ((__noreturn__)); int (*ptr_pthread_getschedparam) (pthread_t, int *, struct sched_param *); int (*ptr_pthread_setschedparam) (pthread_t, int, diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 4e3200ef..26552958 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -28,6 +28,7 @@ GLIBC_2.11 mkostemps F GLIBC_2.11 mkostemps64 F GLIBC_2.11 mkstemps F GLIBC_2.11 mkstemps64 F +GLIBC_2.12 pthread_equal 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 b9c9b75c..84f2643b 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -65,7 +65,6 @@ GLIBC_2.12 pthread_condattr_setclock F GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_create F GLIBC_2.12 pthread_detach F -GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_exit F GLIBC_2.12 pthread_getattr_np F GLIBC_2.12 pthread_getconcurrency F