From 9dfa2562162bf5f7ad1d85d34d827c388631fd86 Mon Sep 17 00:00:00 2001 From: Guy-Fleury Iteriteka Date: Sun, 16 Jul 2023 10:44:05 +0200 Subject: [PATCH] htl: move pthread_equal into libc Signed-off-by: Guy-Fleury Iteriteka Message-Id: <20230716084414.107245-2-gfleury@disroot.org> --- 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/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 7 files changed, 2 insertions(+), 12 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 5de036acfd..b131aa19ab 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-nthreads pt-pthread_self pt-self +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self pt-equal shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 70fa44631a..c2be77997b 100644 --- a/htl/Versions +++ b/htl/Versions @@ -89,7 +89,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 1bee2b0203..a8147d362c 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 aa8561f7d5..0386b755af 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 96728b838f..6aed953d29 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, @@ -100,7 +99,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/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index 2ef0f67091..c4f3eb1246 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -64,7 +64,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 diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index d8785b4cf7..300ef26a9f 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -83,7 +83,6 @@ GLIBC_2.38 pthread_condattr_setclock F GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_create F GLIBC_2.38 pthread_detach F -GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getattr_np F GLIBC_2.38 pthread_getconcurrency F -- 2.43.5