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_join.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_join.c')
| -rw-r--r-- | nptl/pthread_join.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nptl/pthread_join.c b/nptl/pthread_join.c index 4ad718e606..d2b33de73d 100644 --- a/nptl/pthread_join.c +++ b/nptl/pthread_join.c @@ -17,11 +17,20 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" +#include <shlib-compat.h> int -__pthread_join (pthread_t threadid, void **thread_return) +___pthread_join (pthread_t threadid, void **thread_return) { return __pthread_clockjoin_ex (threadid, thread_return, 0 /* Ignored */, NULL, true); } -weak_alias (__pthread_join, pthread_join) +versioned_symbol (libc, ___pthread_join, pthread_join, GLIBC_2_34); +libc_hidden_ver (___pthread_join, __pthread_join) +#ifndef SHARED +strong_alias (___pthread_join, __pthread_join) +#endif + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) +compat_symbol (libc, ___pthread_join, pthread_join, GLIBC_2_0); +#endif |