about summary refs log tree commit diff
path: root/nptl/libpthread-compat.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-11 11:08:00 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-11 11:24:39 +0200
commitddd4a2d3c64642b34d95743db9032c2bb31c16b2 (patch)
treebfa7fb0ef9b4ba4cbf7412960ab665be2503db0c /nptl/libpthread-compat.c
parentdf65f897e9501aa5b64a5cbcb101301715f2ec2f (diff)
downloadglibc-ddd4a2d3c64642b34d95743db9032c2bb31c16b2.tar.gz
glibc-ddd4a2d3c64642b34d95743db9032c2bb31c16b2.tar.xz
glibc-ddd4a2d3c64642b34d95743db9032c2bb31c16b2.zip
nptl: Move thread join functions into libc
The symbols pthread_clockjoin_np, pthread_join, pthread_timedjoin_np,
pthread_tryjoin_np, thrd_join were moved using
scripts/move-symbol-to-libc.py.

Moving the symbols at the same time avoids the need for temporary
exports.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/libpthread-compat.c')
-rw-r--r--nptl/libpthread-compat.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c
index 401fa6ad34..bc9ee36df0 100644
--- a/nptl/libpthread-compat.c
+++ b/nptl/libpthread-compat.c
@@ -69,3 +69,8 @@ compat_symbol (libpthread, __libpthread_version_placeholder_1,
 compat_symbol (libpthread, __libpthread_version_placeholder_1,
 	       __libpthread_version_placeholder, GLIBC_2_30);
 #endif
+
+#if (SHLIB_COMPAT (libpthread, GLIBC_2_31, GLIBC_2_32))
+compat_symbol (libpthread, __libpthread_version_placeholder_1,
+	       __libpthread_version_placeholder, GLIBC_2_31);
+#endif