about summary refs log tree commit diff
path: root/nptl/pthread_cancel.c
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-11 11:56:37 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-11 20:21:30 +0200
commitd7c51fe4f0efd7f3ca505b5d5b3a02d5d72d9bbd (patch)
tree2b7345efa44b58f1bc05800fd4e76df39a6737d6 /nptl/pthread_cancel.c
parentc4c53e0f56ed14ba2416bb0181e82a9d49eefde0 (diff)
downloadglibc-d7c51fe4f0efd7f3ca505b5d5b3a02d5d72d9bbd.tar.gz
glibc-d7c51fe4f0efd7f3ca505b5d5b3a02d5d72d9bbd.tar.xz
glibc-d7c51fe4f0efd7f3ca505b5d5b3a02d5d72d9bbd.zip
nptl: Move pthread_cancel into libc
The symbol was moved using scripts/move-symbol-to-libc.py.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/pthread_cancel.c')
-rw-r--r--nptl/pthread_cancel.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c
index fd04bedf6c..e4ad602900 100644
--- a/nptl/pthread_cancel.c
+++ b/nptl/pthread_cancel.c
@@ -100,6 +100,10 @@ __pthread_cancel (pthread_t th)
 
   return result;
 }
-weak_alias (__pthread_cancel, pthread_cancel)
+versioned_symbol (libc, __pthread_cancel, pthread_cancel, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_cancel, pthread_cancel, GLIBC_2_0);
+#endif
 
 PTHREAD_STATIC_FN_REQUIRE (__pthread_create)