diff options
| author | Guy-Fleury Iteriteka <gfleury@disroot.org> | 2023-03-18 11:58:26 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-04-05 01:26:36 +0200 |
| commit | 5476f8cd2e68800a705e80f568599e1a38facd93 (patch) | |
| tree | 10bab7408f954c4c2f4a4b040daf8f8dfbd0bc3f /htl | |
| parent | f987e9b7a3b98185b3398caaac0ebd24ef4cd358 (diff) | |
| download | glibc-5476f8cd2e68800a705e80f568599e1a38facd93.tar.gz glibc-5476f8cd2e68800a705e80f568599e1a38facd93.tar.xz glibc-5476f8cd2e68800a705e80f568599e1a38facd93.zip | |
htl: move pthread_self info libc.
Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org> Message-Id: <20230318095826.1125734-4-gfleury@disroot.org>
Diffstat (limited to 'htl')
| -rw-r--r-- | htl/Makefile | 3 | ||||
| -rw-r--r-- | htl/Versions | 9 | ||||
| -rw-r--r-- | htl/forward.c | 4 | ||||
| -rw-r--r-- | htl/pt-initialize.c | 1 | ||||
| -rw-r--r-- | htl/pt-self.c | 9 |
5 files changed, 14 insertions, 12 deletions
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 @@ <https://www.gnu.org/licenses/>. */ #include <pthread.h> - +#include <shlib-compat.h> #include <pt-internal.h> /* 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 |