From: Guy-Fleury Iteriteka Date: Sat, 18 Mar 2023 09:58:26 +0000 (+0200) Subject: htl: move pthread_self info libc. X-Git-Tag: glibc-2.38~418 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5476f8cd2e68;p=glibc.git htl: move pthread_self info libc. Signed-off-by: Guy-Fleury Iteriteka Message-Id: <20230318095826.1125734-4-gfleury@disroot.org> --- diff --git a/htl/Makefile b/htl/Makefile index 622e85cef8..0587fd164c 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -52,7 +52,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-nthreads pt-pthread_self +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self pt-self shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 9ec848119e..70fa44631a 100644 --- a/htl/Versions +++ b/htl/Versions @@ -1,4 +1,10 @@ libc { + + GLIBC_2.12 { + pthread_self; + __pthread_self; + } + GLIBC_2.21 { pthread_attr_destroy; pthread_attr_getdetachstate; pthread_attr_getinheritsched; pthread_attr_getschedparam; @@ -119,9 +125,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 8cff4a83ee..1bee2b0203 100644 --- a/htl/forward.c +++ b/htl/forward.c @@ -130,10 +130,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 6ab3434012..aa8561f7d5 100644 --- a/htl/pt-initialize.c +++ b/htl/pt-initialize.c @@ -56,7 +56,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/htl/pt-self.c b/htl/pt-self.c index 26d2b7c5eb..f7e9cb88c4 100644 --- a/htl/pt-self.c +++ b/htl/pt-self.c @@ -17,7 +17,7 @@ . */ #include - +#include #include /* Return the thread ID of the calling thread. */ @@ -36,4 +36,9 @@ __pthread_self (void) return self->thread; } -weak_alias (__pthread_self, pthread_self); +libc_hidden_def (__pthread_self) +versioned_symbol (libc, __pthread_self, pthread_self, GLIBC_2_21); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_21) +compat_symbol (libc, __pthread_self, pthread_self, GLIBC_2_12); +#endif diff --git a/sysdeps/htl/pthread-functions.h b/sysdeps/htl/pthread-functions.h index 815f5622f1..96728b838f 100644 --- a/sysdeps/htl/pthread-functions.h +++ b/sysdeps/htl/pthread-functions.h @@ -56,7 +56,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); @@ -112,7 +111,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/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index 188ceca099..3f052f0e53 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -92,6 +92,8 @@ int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr, int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *); void __pthread_testcancel (void); +libc_hidden_proto (__pthread_self) + #if IS_IN (libpthread) hidden_proto (__pthread_create) hidden_proto (__pthread_detach) diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index da1cad6777..6925222ff3 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -28,6 +28,8 @@ GLIBC_2.11 mkostemps F GLIBC_2.11 mkostemps64 F GLIBC_2.11 mkstemps F GLIBC_2.11 mkstemps64 F +GLIBC_2.12 __pthread_self 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 b9c9b75c28..2ef0f67091 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -4,7 +4,6 @@ GLIBC_2.12 __pthread_get_cleanup_stack F GLIBC_2.12 __pthread_key_create F GLIBC_2.12 __pthread_kill F GLIBC_2.12 __pthread_mutex_transfer_np F -GLIBC_2.12 __pthread_self F GLIBC_2.12 __pthread_spin_destroy F GLIBC_2.12 __pthread_spin_init F GLIBC_2.12 __pthread_spin_lock F @@ -109,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