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:15:10 +0200 |
| commit | cf3fff1c195f859ba949a7ad86d4fca70bd99740 (patch) | |
| tree | bcf3acd913ad5df143e703f5f1324e638db6f448 /sysdeps/pthread | |
| parent | 08a31ef923c51dc5ff2ef815730de0ba4d591ae3 (diff) | |
| download | glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.zip glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.tar.gz glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.tar.bz2 | |
nptl: Move cnd_wait into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The __pthread_cond_wait@@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 | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/cnd_wait.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 4928f91..9a20996 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -34,7 +34,6 @@ 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_wait \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ @@ -44,6 +43,7 @@ $(libpthread-routines-var) += \ cnd_init \ cnd_signal \ cnd_timedwait \ + cnd_wait \ 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_wait.c b/sysdeps/pthread/cnd_wait.c index e2b7e17..3c6d6d4 100644 --- a/sysdeps/pthread/cnd_wait.c +++ b/sysdeps/pthread/cnd_wait.c @@ -17,11 +17,20 @@ <https://www.gnu.org/licenses/>. */ #include "thrd_priv.h" +#include <shlib-compat.h> int -cnd_wait (cnd_t *cond, mtx_t *mutex) +__cnd_wait (cnd_t *cond, mtx_t *mutex) { int err_code = __pthread_cond_wait ((pthread_cond_t *) cond, (pthread_mutex_t *) mutex); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __cnd_wait, cnd_wait, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __cnd_wait, cnd_wait, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__cnd_wait, cnd_wait) +#endif |