From ddd4a2d3c64642b34d95743db9032c2bb31c16b2 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 11 May 2021 11:08:00 +0200 Subject: 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 --- sysdeps/unix/sysv/linux/ia64/libc.abilist | 10 ++++++++++ sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 6 +----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv/linux/ia64') diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index 83985b06e0..f6fc393a21 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -1325,6 +1325,7 @@ GLIBC_2.2 pthread_equal F GLIBC_2.2 pthread_exit F GLIBC_2.2 pthread_getschedparam F GLIBC_2.2 pthread_getspecific F +GLIBC_2.2 pthread_join F GLIBC_2.2 pthread_key_create F GLIBC_2.2 pthread_key_delete F GLIBC_2.2 pthread_kill F @@ -2021,6 +2022,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 @@ -2152,6 +2154,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 @@ -2200,6 +2204,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 @@ -2250,6 +2255,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 @@ -2257,6 +2263,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 @@ -2304,6 +2311,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 @@ -2317,6 +2326,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/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index 4bce0dc13d..8db794d53e 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -15,12 +15,10 @@ GLIBC_2.2 pthread_cancel F GLIBC_2.2 pthread_create F GLIBC_2.2 pthread_getconcurrency F GLIBC_2.2 pthread_getcpuclockid F -GLIBC_2.2 pthread_join F GLIBC_2.2 pthread_setconcurrency F GLIBC_2.2.3 __libpthread_version_placeholder 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 @@ -30,11 +28,9 @@ GLIBC_2.3.3 pthread_attr_getaffinity_np F GLIBC_2.3.3 pthread_attr_setstack F GLIBC_2.3.3 pthread_attr_setstacksize 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 -- cgit 1.4.1