aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/pthread/mtx_init.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:15:22 +0200
commitf44c9a24edf0dff4fd76562975533d58c1cd6dd4 (patch)
tree196eb57d4feb0faca29e34dbb413c76cb4c761b6 /sysdeps/pthread/mtx_init.c
parent17b67416c5ea65507c9b32aec1928afc88569eb2 (diff)
downloadglibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.zip
glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar.gz
glibc-f44c9a24edf0dff4fd76562975533d58c1cd6dd4.tar.bz2
nptl: Move mtx_init into libc
The symbol was moved using scripts/move-symbol-to-libc.py. The calls to __pthread_mutex_init, __pthread_mutexattr_init, __pthread_mutexattr_settype are now private and no longer need to be exported. This allows the removal of the newly added GLIBC_2.34 symbol versions for those functions. Also clean up some weak declarations in <libc-lockP.h> for these functions. They are not needed and potentially incorrect for static linking of mtx_init. Reviewed-by: Carlos O'Donell <carlos@redhat.com> Tested-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'sysdeps/pthread/mtx_init.c')
-rw-r--r--sysdeps/pthread/mtx_init.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sysdeps/pthread/mtx_init.c b/sysdeps/pthread/mtx_init.c
index 8d5f194..e99258b 100644
--- a/sysdeps/pthread/mtx_init.c
+++ b/sysdeps/pthread/mtx_init.c
@@ -17,11 +17,12 @@
<https://www.gnu.org/licenses/>. */
#include <stdalign.h>
+#include <shlib-compat.h>
#include "thrd_priv.h"
int
-mtx_init (mtx_t *mutex, int type)
+__mtx_init (mtx_t *mutex, int type)
{
_Static_assert (sizeof (mtx_t) == sizeof (pthread_mutex_t),
"sizeof (mtx_t) != sizeof (pthread_mutex_t)");
@@ -51,3 +52,11 @@ mtx_init (mtx_t *mutex, int type)
/* pthread_mutexattr_destroy implementation is a noop. */
return thrd_err_map (err_code);
}
+#if PTHREAD_IN_LIBC
+versioned_symbol (libc, __mtx_init, mtx_init, GLIBC_2_34);
+# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_28, GLIBC_2_34)
+compat_symbol (libpthread, __mtx_init, mtx_init, GLIBC_2_28);
+# endif
+#else /* !PTHREAD_IN_LIBC */
+strong_alias (__mtx_init, mtx_init)
+#endif