diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:12:11 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-03 08:14:38 +0200 |
| commit | 3eab466e566c5c28cbec55b092fe21e134baac22 (patch) | |
| tree | 0ac64e4963ae00618a3b492df547c2d85a78ac13 /sysdeps/pthread | |
| parent | f11c293a4c3c637c3eecae00b341c578f52bdc46 (diff) | |
| download | glibc-3eab466e566c5c28cbec55b092fe21e134baac22.zip glibc-3eab466e566c5c28cbec55b092fe21e134baac22.tar.gz glibc-3eab466e566c5c28cbec55b092fe21e134baac22.tar.bz2 | |
nptl: Move cnd_init into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The __pthread_cond_init@@GLIBC_PRIVATE symbol is no longer
neded, so remove that as well.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/pthread')
| -rw-r--r-- | sysdeps/pthread/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/cnd_init.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index d7cfce2..6ef49cd 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -34,13 +34,14 @@ routines += thrd_current thrd_equal thrd_sleep thrd_yield libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \ mtx_destroy mtx_init mtx_lock mtx_timedlock \ mtx_trylock mtx_unlock \ - cnd_init cnd_signal cnd_timedwait cnd_wait \ + cnd_signal cnd_timedwait cnd_wait \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ call_once \ cnd_broadcast \ cnd_destroy \ + cnd_init \ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \ diff --git a/sysdeps/pthread/cnd_init.c b/sysdeps/pthread/cnd_init.c index 044cc1d..791a9eb 100644 --- a/sysdeps/pthread/cnd_init.c +++ b/sysdeps/pthread/cnd_init.c @@ -17,11 +17,12 @@ <https://www.gnu.org/licenses/>. */ #include <stdalign.h> +#include <shlib-compat.h> #include "thrd_priv.h" int -cnd_init (cnd_t *cond) +__cnd_init (cnd_t *cond) { _Static_assert (sizeof (cnd_t) == sizeof (pthread_cond_t), "(sizeof (cnd_t) != sizeof (pthread_cond_t)"); @@ -31,3 +32,11 @@ cnd_init (cnd_t *cond) int err_code = __pthread_cond_init ((pthread_cond_t *)cond, NULL); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __cnd_init, cnd_init, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __cnd_init, cnd_init, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__cnd_init, cnd_init) +#endif |