diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-11 11:08:00 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-11 11:24:39 +0200 |
| commit | ddd4a2d3c64642b34d95743db9032c2bb31c16b2 (patch) | |
| tree | bfa7fb0ef9b4ba4cbf7412960ab665be2503db0c /nptl/pthreadP.h | |
| parent | df65f897e9501aa5b64a5cbcb101301715f2ec2f (diff) | |
| download | glibc-ddd4a2d3c64642b34d95743db9032c2bb31c16b2.tar.gz glibc-ddd4a2d3c64642b34d95743db9032c2bb31c16b2.tar.xz glibc-ddd4a2d3c64642b34d95743db9032c2bb31c16b2.zip | |
nptl: Move thread join functions into libc
The symbols pthread_clockjoin_np, pthread_join, pthread_timedjoin_np, pthread_tryjoin_np, thrd_join were moved using scripts/move-symbol-to-libc.py. Moving the symbols at the same time avoids the need for temporary exports. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthreadP.h')
| -rw-r--r-- | nptl/pthreadP.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 34d133b187..7e3cef4709 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -456,10 +456,10 @@ libc_hidden_proto (__pthread_cond_wait) extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, clockid_t clockid, const struct __timespec64 *abstime); -libpthread_hidden_proto (__pthread_clockjoin_np64) +libc_hidden_proto (__pthread_clockjoin_np64) extern int __pthread_timedjoin_np64 (pthread_t threadid, void **thread_return, const struct __timespec64 *abstime); -libpthread_hidden_proto (__pthread_timedjoin_np64) +libc_hidden_proto (__pthread_timedjoin_np64) extern int __pthread_cond_timedwait64 (pthread_cond_t *cond, pthread_mutex_t *mutex, const struct __timespec64 *abstime); @@ -535,6 +535,7 @@ extern int __pthread_kill (pthread_t threadid, int signo); extern void __pthread_exit (void *value) __attribute__ ((__noreturn__)); libc_hidden_proto (__pthread_exit) extern int __pthread_join (pthread_t threadid, void **thread_return); +libc_hidden_proto (__pthread_join) extern int __pthread_setcanceltype (int type, int *oldtype); libc_hidden_proto (__pthread_setcanceltype) extern void __pthread_testcancel (void); |