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/microblaze/be/libc.abilist | 10 ++++++++++ sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist | 6 +----- sysdeps/unix/sysv/linux/microblaze/le/libc.abilist | 10 ++++++++++ sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist | 6 +----- 4 files changed, 22 insertions(+), 10 deletions(-) (limited to 'sysdeps/unix/sysv/linux/microblaze') diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist index 5eebad0468..f07dba5ef0 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist @@ -1483,6 +1483,7 @@ GLIBC_2.18 pthread_getaffinity_np F GLIBC_2.18 pthread_getattr_np F GLIBC_2.18 pthread_getschedparam F GLIBC_2.18 pthread_getspecific F +GLIBC_2.18 pthread_join F GLIBC_2.18 pthread_key_create F GLIBC_2.18 pthread_key_delete F GLIBC_2.18 pthread_kill F @@ -1542,6 +1543,8 @@ GLIBC_2.18 pthread_spin_lock F GLIBC_2.18 pthread_spin_trylock F GLIBC_2.18 pthread_spin_unlock F GLIBC_2.18 pthread_testcancel F +GLIBC_2.18 pthread_timedjoin_np F +GLIBC_2.18 pthread_tryjoin_np F GLIBC_2.18 pthread_yield F GLIBC_2.18 ptrace F GLIBC_2.18 ptsname F @@ -2246,6 +2249,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 @@ -2265,6 +2269,7 @@ GLIBC_2.30 sem_clockwait F GLIBC_2.30 tgkill F GLIBC_2.30 twalk_r F GLIBC_2.31 msgctl F +GLIBC_2.31 pthread_clockjoin_np F GLIBC_2.31 semctl F GLIBC_2.31 shmctl F GLIBC_2.32 __libc_single_threaded D 0x1 @@ -2316,6 +2321,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 @@ -2323,6 +2329,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 @@ -2370,6 +2377,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 @@ -2383,6 +2392,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/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist index 2fa73b3f83..64fff0e0e0 100644 --- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist @@ -18,15 +18,11 @@ GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_getconcurrency F GLIBC_2.18 pthread_getcpuclockid F GLIBC_2.18 pthread_getname_np F -GLIBC_2.18 pthread_join F GLIBC_2.18 pthread_setaffinity_np F GLIBC_2.18 pthread_setconcurrency F GLIBC_2.18 pthread_setname_np F GLIBC_2.18 pthread_setschedprio F GLIBC_2.18 pthread_sigqueue F -GLIBC_2.18 pthread_timedjoin_np F -GLIBC_2.18 pthread_tryjoin_np F GLIBC_2.28 thrd_create F -GLIBC_2.28 thrd_join F GLIBC_2.30 __libpthread_version_placeholder F -GLIBC_2.31 pthread_clockjoin_np F +GLIBC_2.31 __libpthread_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist index 9c54e2d42c..688de4ee35 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist @@ -1483,6 +1483,7 @@ GLIBC_2.18 pthread_getaffinity_np F GLIBC_2.18 pthread_getattr_np F GLIBC_2.18 pthread_getschedparam F GLIBC_2.18 pthread_getspecific F +GLIBC_2.18 pthread_join F GLIBC_2.18 pthread_key_create F GLIBC_2.18 pthread_key_delete F GLIBC_2.18 pthread_kill F @@ -1542,6 +1543,8 @@ GLIBC_2.18 pthread_spin_lock F GLIBC_2.18 pthread_spin_trylock F GLIBC_2.18 pthread_spin_unlock F GLIBC_2.18 pthread_testcancel F +GLIBC_2.18 pthread_timedjoin_np F +GLIBC_2.18 pthread_tryjoin_np F GLIBC_2.18 pthread_yield F GLIBC_2.18 ptrace F GLIBC_2.18 ptsname F @@ -2246,6 +2249,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 @@ -2264,6 +2268,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 @@ -2313,6 +2318,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 @@ -2320,6 +2326,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 @@ -2367,6 +2374,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 @@ -2380,6 +2389,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/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist index 2fa73b3f83..64fff0e0e0 100644 --- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist @@ -18,15 +18,11 @@ GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.18 pthread_getconcurrency F GLIBC_2.18 pthread_getcpuclockid F GLIBC_2.18 pthread_getname_np F -GLIBC_2.18 pthread_join F GLIBC_2.18 pthread_setaffinity_np F GLIBC_2.18 pthread_setconcurrency F GLIBC_2.18 pthread_setname_np F GLIBC_2.18 pthread_setschedprio F GLIBC_2.18 pthread_sigqueue F -GLIBC_2.18 pthread_timedjoin_np F -GLIBC_2.18 pthread_tryjoin_np F GLIBC_2.28 thrd_create F -GLIBC_2.28 thrd_join F GLIBC_2.30 __libpthread_version_placeholder F -GLIBC_2.31 pthread_clockjoin_np F +GLIBC_2.31 __libpthread_version_placeholder F -- cgit 1.4.1