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/pthread_tryjoin.c | |
| 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/pthread_tryjoin.c')
| -rw-r--r-- | nptl/pthread_tryjoin.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nptl/pthread_tryjoin.c b/nptl/pthread_tryjoin.c index 62c9469258..fd938e8780 100644 --- a/nptl/pthread_tryjoin.c +++ b/nptl/pthread_tryjoin.c @@ -17,9 +17,10 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" +#include <shlib-compat.h> int -pthread_tryjoin_np (pthread_t threadid, void **thread_return) +__pthread_tryjoin_np (pthread_t threadid, void **thread_return) { /* Return right away if the thread hasn't terminated yet. */ struct pthread *pd = (struct pthread *) threadid; @@ -31,3 +32,8 @@ pthread_tryjoin_np (pthread_t threadid, void **thread_return) return __pthread_clockjoin_ex (threadid, thread_return, 0 /* Ignored */, NULL, false); } +versioned_symbol (libc, __pthread_tryjoin_np, pthread_tryjoin_np, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34) +compat_symbol (libc, __pthread_tryjoin_np, pthread_tryjoin_np, GLIBC_2_3_3); +#endif |