about summary refs log tree commit diff
path: root/sysdeps/pthread/cnd_destroy.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-03 08:12:11 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-03 08:14:28 +0200
commitf11c293a4c3c637c3eecae00b341c578f52bdc46 (patch)
treef3b69e08b80b1fc98ace16d01563086f04cb9e99 /sysdeps/pthread/cnd_destroy.c
parent0431f171daefc436b8d185d852e45800745d7496 (diff)
downloadglibc-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/cnd_destroy.c')
-rw-r--r--sysdeps/pthread/cnd_destroy.c11
1 files changed, 10 insertions, 1 deletions
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