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/powerpc/powerpc64 | |
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/powerpc/powerpc64')
4 files changed, 22 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist index 8725f4a851..4d72e24c22 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist @@ -140,6 +140,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 @@ -1429,6 +1430,7 @@ GLIBC_2.3 pthread_exit F GLIBC_2.3 pthread_getattr_np F GLIBC_2.3 pthread_getschedparam F GLIBC_2.3 pthread_getspecific F +GLIBC_2.3 pthread_join F GLIBC_2.3 pthread_key_create F GLIBC_2.3 pthread_key_delete F GLIBC_2.3 pthread_kill F @@ -2099,6 +2101,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 @@ -2168,6 +2172,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 @@ -2217,6 +2222,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 @@ -2224,6 +2230,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 @@ -2271,6 +2278,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 @@ -2284,6 +2293,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/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index dcc050bfb0..66f04c69a2 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.12 pthread_getname_np F GLIBC_2.12 pthread_setname_np F GLIBC_2.18 pthread_getattr_default_np F GLIBC_2.28 thrd_create F -GLIBC_2.28 thrd_join F GLIBC_2.3 __errno_location F GLIBC_2.3 pthread_attr_getguardsize F GLIBC_2.3 pthread_attr_getstack F @@ -17,7 +16,6 @@ GLIBC_2.3 pthread_cancel F GLIBC_2.3 pthread_create F GLIBC_2.3 pthread_getconcurrency F GLIBC_2.3 pthread_getcpuclockid F -GLIBC_2.3 pthread_join F GLIBC_2.3 pthread_setconcurrency F GLIBC_2.3.2 __libpthread_version_placeholder F GLIBC_2.3.3 __pthread_register_cancel F @@ -26,13 +24,11 @@ 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 GLIBC_2.6 pthread_attr_setstack F GLIBC_2.6 pthread_attr_setstacksize F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist index 89ab60dc38..d3ac4aeefc 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist @@ -1569,6 +1569,7 @@ GLIBC_2.17 pthread_getaffinity_np F GLIBC_2.17 pthread_getattr_np F GLIBC_2.17 pthread_getschedparam F GLIBC_2.17 pthread_getspecific F +GLIBC_2.17 pthread_join F GLIBC_2.17 pthread_key_create F GLIBC_2.17 pthread_key_delete F GLIBC_2.17 pthread_kill F @@ -1627,6 +1628,8 @@ GLIBC_2.17 pthread_spin_lock F GLIBC_2.17 pthread_spin_trylock F GLIBC_2.17 pthread_spin_unlock F GLIBC_2.17 pthread_testcancel F +GLIBC_2.17 pthread_timedjoin_np F +GLIBC_2.17 pthread_tryjoin_np F GLIBC_2.17 pthread_yield F GLIBC_2.17 ptrace F GLIBC_2.17 ptsname F @@ -2345,6 +2348,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 @@ -2375,6 +2379,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 __argp_errorieee128 F GLIBC_2.32 __argp_failureieee128 F GLIBC_2.32 __asprintf_chkieee128 F @@ -2518,6 +2523,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 @@ -2525,6 +2531,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 @@ -2572,6 +2579,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 @@ -2585,6 +2594,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/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index 19dbf85495..2b21af13ad 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -17,16 +17,12 @@ GLIBC_2.17 pthread_create F GLIBC_2.17 pthread_getconcurrency F GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getname_np F -GLIBC_2.17 pthread_join F GLIBC_2.17 pthread_setaffinity_np F GLIBC_2.17 pthread_setconcurrency F GLIBC_2.17 pthread_setname_np F GLIBC_2.17 pthread_setschedprio F GLIBC_2.17 pthread_sigqueue F -GLIBC_2.17 pthread_timedjoin_np F -GLIBC_2.17 pthread_tryjoin_np F GLIBC_2.18 pthread_getattr_default_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 |