about summary refs log tree commit diff
path: root/nptl/cleanup_routine.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-21 19:49:50 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-21 19:49:50 +0200
commit5715c29e91076800418833f2196f2082f439da75 (patch)
treea55e45379c0b3f134471312e55d87166f46ca894 /nptl/cleanup_routine.c
parentf03b78fae46905a5676c7b7f360cadba2f290708 (diff)
downloadglibc-5715c29e91076800418833f2196f2082f439da75.tar.gz
glibc-5715c29e91076800418833f2196f2082f439da75.tar.xz
glibc-5715c29e91076800418833f2196f2082f439da75.zip
nptl: Move __pthread_cleanup_routine into libc
Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/cleanup_routine.c')
-rw-r--r--nptl/cleanup_routine.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/nptl/cleanup_routine.c b/nptl/cleanup_routine.c
index 973f088be7..929818051c 100644
--- a/nptl/cleanup_routine.c
+++ b/nptl/cleanup_routine.c
@@ -17,11 +17,18 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
-
+#include <shlib-compat.h>
 
 void
-__pthread_cleanup_routine (struct __pthread_cleanup_frame *f)
+___pthread_cleanup_routine (struct __pthread_cleanup_frame *f)
 {
   if (f->__do_it)
     f->__cancel_routine (f->__cancel_arg);
 }
+versioned_symbol (libc, ___pthread_cleanup_routine, __pthread_cleanup_routine,
+                  GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34)
+compat_symbol (libpthread, ___pthread_cleanup_routine,
+               __pthread_cleanup_routine, GLIBC_2_3_3);
+#endif