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:49 +0200 |
| commit | eef936eb458e5dfccceee6d3c4220f9a1c62832b (patch) | |
| tree | 00c1601e791ccc135b4c37385520b997bb30331f /sysdeps/pthread | |
| parent | 3eab466e566c5c28cbec55b092fe21e134baac22 (diff) | |
| download | glibc-eef936eb458e5dfccceee6d3c4220f9a1c62832b.zip glibc-eef936eb458e5dfccceee6d3c4220f9a1c62832b.tar.gz glibc-eef936eb458e5dfccceee6d3c4220f9a1c62832b.tar.bz2 | |
nptl: Move cnd_signal into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
The __pthread_cond_signal@@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_signal.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 6ef49cd..fcc5f84 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -34,7 +34,7 @@ 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_signal cnd_timedwait cnd_wait \ + cnd_timedwait cnd_wait \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ @@ -42,6 +42,7 @@ $(libpthread-routines-var) += \ cnd_broadcast \ cnd_destroy \ cnd_init \ + cnd_signal \ 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_signal.c b/sysdeps/pthread/cnd_signal.c index 48b0f6a..2800dd4 100644 --- a/sysdeps/pthread/cnd_signal.c +++ b/sysdeps/pthread/cnd_signal.c @@ -17,10 +17,19 @@ <https://www.gnu.org/licenses/>. */ #include "thrd_priv.h" +#include <shlib-compat.h> int -cnd_signal (cnd_t *cond) +__cnd_signal (cnd_t *cond) { int err_code = __pthread_cond_signal ((pthread_cond_t *) cond); return thrd_err_map (err_code); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __cnd_signal, cnd_signal, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __cnd_signal, cnd_signal, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__cnd_signal, cnd_signal) +#endif |