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:28 +0200 |
| commit | f11c293a4c3c637c3eecae00b341c578f52bdc46 (patch) | |
| tree | f3b69e08b80b1fc98ace16d01563086f04cb9e99 /sysdeps/pthread | |
| parent | 0431f171daefc436b8d185d852e45800745d7496 (diff) | |
| download | glibc-f11c293a4c3c637c3eecae00b341c578f52bdc46.tar.gz glibc-f11c293a4c3c637c3eecae00b341c578f52bdc46.tar.xz glibc-f11c293a4c3c637c3eecae00b341c578f52bdc46.zip | |
nptl: Move cnd_destroy into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The __pthread_cond_destroy@@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_destroy.c | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 821f4c920f..d7cfce2d33 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -34,12 +34,13 @@ 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_destroy cnd_init cnd_signal cnd_timedwait cnd_wait \ + cnd_init cnd_signal cnd_timedwait cnd_wait \ tss_create tss_delete tss_get tss_set $(libpthread-routines-var) += \ call_once \ cnd_broadcast \ + cnd_destroy \ 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_destroy.c b/sysdeps/pthread/cnd_destroy.c index 5ef43bf74b..830cf6d7cb 100644 --- a/sysdeps/pthread/cnd_destroy.c +++ b/sysdeps/pthread/cnd_destroy.c @@ -18,9 +18,18 @@ #include "thrd_priv.h" #include "pthreadP.h" +#include <shlib-compat.h> void -cnd_destroy (cnd_t *cond) +__cnd_destroy (cnd_t *cond) { __pthread_cond_destroy ((pthread_cond_t *) cond); } +#if PTHREAD_IN_LIBC +versioned_symbol (libc, __cnd_destroy, cnd_destroy, GLIBC_2_34); +# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34) +compat_symbol (libpthread, __cnd_destroy, cnd_destroy, GLIBC_2_28); +# endif +#else /* !PTHREAD_IN_LIBC */ +strong_alias (__cnd_destroy, cnd_destroy) +#endif |