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 /sysdeps/unix/sysv/linux/x86_64/64 | |
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 'sysdeps/unix/sysv/linux/x86_64/64')
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/libc.abilist | 10 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 6 |
2 files changed, 11 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist index a893315017..c34f50d673 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist @@ -1319,6 +1319,7 @@ GLIBC_2.2.5 pthread_exit F GLIBC_2.2.5 pthread_getattr_np F GLIBC_2.2.5 pthread_getschedparam F GLIBC_2.2.5 pthread_getspecific F +GLIBC_2.2.5 pthread_join F GLIBC_2.2.5 pthread_key_create F GLIBC_2.2.5 pthread_key_delete F GLIBC_2.2.5 pthread_kill F @@ -2002,6 +2003,7 @@ GLIBC_2.28 thrd_current F GLIBC_2.28 thrd_detach F GLIBC_2.28 thrd_equal F GLIBC_2.28 thrd_exit F +GLIBC_2.28 thrd_join F GLIBC_2.28 thrd_sleep F GLIBC_2.28 thrd_yield F GLIBC_2.28 tss_create F @@ -2133,6 +2135,8 @@ GLIBC_2.3.3 pthread_barrierattr_getpshared F GLIBC_2.3.3 pthread_condattr_getclock F GLIBC_2.3.3 pthread_condattr_setclock F GLIBC_2.3.3 pthread_getaffinity_np F +GLIBC_2.3.3 pthread_timedjoin_np F +GLIBC_2.3.3 pthread_tryjoin_np F GLIBC_2.3.3 remap_file_pages F GLIBC_2.3.3 sched_getaffinity F GLIBC_2.3.3 sched_setaffinity F @@ -2181,6 +2185,7 @@ GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F GLIBC_2.30 tgkill F GLIBC_2.30 twalk_r F +GLIBC_2.31 pthread_clockjoin_np F GLIBC_2.32 __libc_single_threaded D 0x1 GLIBC_2.32 pthread_attr_getsigmask_np F GLIBC_2.32 pthread_attr_setaffinity_np F @@ -2232,6 +2237,7 @@ GLIBC_2.34 pthread_barrierattr_destroy F GLIBC_2.34 pthread_barrierattr_getpshared F GLIBC_2.34 pthread_barrierattr_init F GLIBC_2.34 pthread_barrierattr_setpshared F +GLIBC_2.34 pthread_clockjoin_np F GLIBC_2.34 pthread_cond_clockwait F GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F @@ -2239,6 +2245,7 @@ GLIBC_2.34 pthread_condattr_setclock F GLIBC_2.34 pthread_condattr_setpshared F GLIBC_2.34 pthread_detach F GLIBC_2.34 pthread_getspecific F +GLIBC_2.34 pthread_join F GLIBC_2.34 pthread_key_create F GLIBC_2.34 pthread_key_delete F GLIBC_2.34 pthread_kill F @@ -2286,6 +2293,8 @@ GLIBC_2.34 pthread_spin_lock F GLIBC_2.34 pthread_spin_trylock F GLIBC_2.34 pthread_spin_unlock F GLIBC_2.34 pthread_testcancel F +GLIBC_2.34 pthread_timedjoin_np F +GLIBC_2.34 pthread_tryjoin_np F GLIBC_2.34 sem_clockwait F GLIBC_2.34 sem_close F GLIBC_2.34 sem_destroy F @@ -2299,6 +2308,7 @@ GLIBC_2.34 sem_unlink F GLIBC_2.34 sem_wait F GLIBC_2.34 thrd_detach F GLIBC_2.34 thrd_exit F +GLIBC_2.34 thrd_join F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F GLIBC_2.34 tss_get F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index cff27401f8..acfc54c409 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -15,11 +15,9 @@ GLIBC_2.2.5 pthread_cancel F GLIBC_2.2.5 pthread_create F GLIBC_2.2.5 pthread_getconcurrency F GLIBC_2.2.5 pthread_getcpuclockid F -GLIBC_2.2.5 pthread_join F GLIBC_2.2.5 pthread_setconcurrency F GLIBC_2.2.6 __libpthread_version_placeholder F GLIBC_2.28 thrd_create F -GLIBC_2.28 thrd_join F GLIBC_2.3.2 __libpthread_version_placeholder F GLIBC_2.3.3 __pthread_register_cancel F GLIBC_2.3.3 __pthread_register_cancel_defer F @@ -27,11 +25,9 @@ GLIBC_2.3.3 __pthread_unregister_cancel F GLIBC_2.3.3 __pthread_unregister_cancel_restore F GLIBC_2.3.3 pthread_attr_getaffinity_np F GLIBC_2.3.3 pthread_setaffinity_np F -GLIBC_2.3.3 pthread_timedjoin_np F -GLIBC_2.3.3 pthread_tryjoin_np F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 __libpthread_version_placeholder F -GLIBC_2.31 pthread_clockjoin_np F +GLIBC_2.31 __libpthread_version_placeholder F GLIBC_2.4 __libpthread_version_placeholder F |