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 | df65f897e9501aa5b64a5cbcb101301715f2ec2f (patch) | |
| tree | ed8e6ba638dde4a447fb1a30107a62f8287dcb4f /sysdeps | |
| parent | 8fbb33b3f74560ea3c74d289bdf59cffce52b463 (diff) | |
| download | glibc-df65f897e9501aa5b64a5cbcb101301715f2ec2f.tar.xz glibc-df65f897e9501aa5b64a5cbcb101301715f2ec2f.zip | |
nptl: Move pthread_detach, thrd_detach into libc
The symbols were moved using scripts/move-symbol-to-libc.py.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps')
63 files changed, 140 insertions, 60 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 54bb11bab9..ec8e3af577 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -31,7 +31,7 @@ headers += threads.h routines += thrd_current thrd_equal thrd_sleep thrd_yield -libpthread-routines += thrd_create thrd_detach thrd_join +libpthread-routines += thrd_create thrd_join $(libpthread-routines-var) += \ call_once \ @@ -47,6 +47,7 @@ $(libpthread-routines-var) += \ mtx_timedlock \ mtx_trylock \ mtx_unlock \ + thrd_detach \ thrd_exit \ tss_create \ tss_delete \ diff --git a/sysdeps/pthread/thrd_detach.c b/sysdeps/pthread/thrd_detach.c index cbc63f57a2..29ac011d5b 100644 --- a/sysdeps/pthread/thrd_detach.c +++ b/sysdeps/pthread/thrd_detach.c @@ -17,12 +17,21 @@ <https://www.gnu.org/licenses/>. */ #include "thrd_priv.h" +#include <shlib-compat.h> int -thrd_detach (thrd_t thr) +__thrd_detach (thrd_t thr) { int err_code; err_code = __pthread_detach (thr); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __thrd_detach, thrd_detach, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libc, __thrd_detach, thrd_detach, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__thrd_detach, thrd_detach) +#endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index caee529c98..b5b0b44697 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1474,6 +1474,7 @@ GLIBC_2.17 pthread_condattr_getpshared F GLIBC_2.17 pthread_condattr_init F GLIBC_2.17 pthread_condattr_setclock F GLIBC_2.17 pthread_condattr_setpshared F +GLIBC_2.17 pthread_detach F GLIBC_2.17 pthread_equal F GLIBC_2.17 pthread_exit F GLIBC_2.17 pthread_getaffinity_np F @@ -2251,6 +2252,7 @@ GLIBC_2.28 mtx_unlock F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F 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_sleep F @@ -2325,6 +2327,7 @@ GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F 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_key_create F GLIBC_2.34 pthread_key_delete F @@ -2384,6 +2387,7 @@ GLIBC_2.34 sem_timedwait F GLIBC_2.34 sem_trywait F 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 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index c8b6351300..19dbf85495 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -14,7 +14,6 @@ GLIBC_2.17 pthread_attr_setstackaddr F GLIBC_2.17 pthread_attr_setstacksize F GLIBC_2.17 pthread_cancel F GLIBC_2.17 pthread_create F -GLIBC_2.17 pthread_detach F GLIBC_2.17 pthread_getconcurrency F GLIBC_2.17 pthread_getcpuclockid F GLIBC_2.17 pthread_getname_np F @@ -28,7 +27,6 @@ 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_detach F GLIBC_2.28 thrd_join F GLIBC_2.30 __libpthread_version_placeholder F GLIBC_2.31 pthread_clockjoin_np F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 7a9a6608f4..20d4855e90 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -897,6 +897,7 @@ GLIBC_2.0 pthread_cond_timedwait F GLIBC_2.0 pthread_cond_wait F GLIBC_2.0 pthread_condattr_destroy F GLIBC_2.0 pthread_condattr_init F +GLIBC_2.0 pthread_detach F GLIBC_2.0 pthread_equal F GLIBC_2.0 pthread_exit F GLIBC_2.0 pthread_getschedparam F @@ -2149,6 +2150,7 @@ GLIBC_2.28 mtx_unlock F GLIBC_2.28 renameat2 F GLIBC_2.28 statx F 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_sleep F @@ -2412,6 +2414,7 @@ GLIBC_2.34 pthread_condattr_getclock F GLIBC_2.34 pthread_condattr_getpshared F 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_key_create F GLIBC_2.34 pthread_key_delete F @@ -2471,6 +2474,7 @@ GLIBC_2.34 sem_timedwait F GLIBC_2.34 sem_trywait F 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 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 992a319089..3acd9f4d77 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/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_detach F GLIBC_2.0 pthread_join F GLIBC_2.1 pthread_attr_getguardsize F GLIBC_2.1 pthread_attr_getstackaddr F @@ -24,7 +23,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_detach F GLIBC_2.28 thrd_join F GLIBC_2.3.2 __libpthread_version_placeholder F GLIBC_2.3.3 __pthread_register_cancel F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 6fef10b0ad..19eb517f28 100644 --- a/sysdeps/unix/sysv/linux/ar |
