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/cnd_wait.c | |
| parent | 08a31ef923c51dc5ff2ef815730de0ba4d591ae3 (diff) | |
| download | glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.tar.gz glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.tar.xz glibc-cf3fff1c195f859ba949a7ad86d4fca70bd99740.zip | |
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/cnd_wait.c')
| -rw-r--r-- | sysdeps/pthread/cnd_wait.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sysdeps/pthread/cnd_wait.c b/sysdeps/pthread/cnd_wait.c index e2b7e175fb..3c6d6d41d6 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 |