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/m68k | |
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/m68k')
4 files changed, 22 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 7d38f2fe55..dfb73924b9 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -141,6 +141,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 @@ -160,6 +161,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 @@ -211,6 +213,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 @@ -218,6 +221,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 @@ -265,6 +269,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 @@ -278,6 +284,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 @@ -1678,6 +1685,7 @@ GLIBC_2.4 pthread_getaffinity_np F GLIBC_2.4 pthread_getattr_np F GLIBC_2.4 pthread_getschedparam F GLIBC_2.4 pthread_getspecific F +GLIBC_2.4 pthread_join F GLIBC_2.4 pthread_key_create F GLIBC_2.4 pthread_key_delete F GLIBC_2.4 pthread_kill F @@ -1733,6 +1741,8 @@ GLIBC_2.4 pthread_spin_lock F GLIBC_2.4 pthread_spin_trylock F GLIBC_2.4 pthread_spin_unlock F GLIBC_2.4 pthread_testcancel F +GLIBC_2.4 pthread_timedjoin_np F +GLIBC_2.4 pthread_tryjoin_np F GLIBC_2.4 pthread_yield F GLIBC_2.4 ptrace F GLIBC_2.4 ptsname F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index f01cfc4c0b..d629cc23e7 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -3,9 +3,8 @@ 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.30 __libpthread_version_placeholder F -GLIBC_2.31 pthread_clockjoin_np F +GLIBC_2.31 __libpthread_version_placeholder F GLIBC_2.4 __errno_location F GLIBC_2.4 __libpthread_version_placeholder F GLIBC_2.4 __pthread_register_cancel F @@ -25,9 +24,6 @@ GLIBC_2.4 pthread_cancel F GLIBC_2.4 pthread_create F GLIBC_2.4 pthread_getconcurrency F GLIBC_2.4 pthread_getcpuclockid F -GLIBC_2.4 pthread_join F GLIBC_2.4 pthread_setaffinity_np F GLIBC_2.4 pthread_setconcurrency F GLIBC_2.4 pthread_setschedprio F -GLIBC_2.4 pthread_timedjoin_np F -GLIBC_2.4 pthread_tryjoin_np F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index 99ad04d858..1a88ecbca4 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -878,6 +878,7 @@ GLIBC_2.0 pthread_equal F GLIBC_2.0 pthread_exit F GLIBC_2.0 pthread_getschedparam F GLIBC_2.0 pthread_getspecific F +GLIBC_2.0 pthread_join F GLIBC_2.0 pthread_key_create F GLIBC_2.0 pthread_key_delete F GLIBC_2.0 pthread_kill F @@ -2109,6 +2110,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 @@ -2244,6 +2246,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 @@ -2291,6 +2295,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 @@ -2342,6 +2347,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 @@ -2349,6 +2355,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 @@ -2396,6 +2403,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 @@ -2409,6 +2418,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/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index aea7e9e7bc..6c36475ccb 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -1,7 +1,6 @@ GLIBC_2.0 __errno_location F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F -GLIBC_2.0 pthread_join F GLIBC_2.1 pthread_attr_getguardsize F GLIBC_2.1 pthread_attr_getstackaddr F GLIBC_2.1 pthread_attr_getstacksize F @@ -23,7 +22,6 @@ GLIBC_2.2 pthread_getcpuclockid 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 @@ -31,11 +29,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 |