about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-23 09:43:08 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-23 09:43:08 +0200
commita2975191d0e852ba2501f4cf1588aae76bdad303 (patch)
tree5523f44fd3fd7d06c15842e98d4ecadcd4e01f0a /nptl
parent4b85c6f55fa9be1b1ff2c5ac67c8dcb63f883789 (diff)
downloadglibc-a2975191d0e852ba2501f4cf1588aae76bdad303.tar.gz
glibc-a2975191d0e852ba2501f4cf1588aae76bdad303.tar.xz
glibc-a2975191d0e852ba2501f4cf1588aae76bdad303.zip
nptl: Move pthread_mutex_setprioceiling into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile2
-rw-r--r--nptl/Versions3
-rw-r--r--nptl/pthread_mutex_setprioceiling.c13
3 files changed, 13 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 2f8cebb760..573dfd03b1 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -99,6 +99,7 @@ routines = \
   pthread_mutex_getprioceiling \
   pthread_mutex_init \
   pthread_mutex_lock \
+  pthread_mutex_setprioceiling \
   pthread_mutex_unlock \
   pthread_once \
   pthread_rwlock_rdlock \
@@ -159,7 +160,6 @@ libpthread-routines = \
   pthread_getname \
   pthread_join \
   pthread_join_common \
-  pthread_mutex_setprioceiling \
   pthread_mutex_timedlock \
   pthread_mutex_trylock \
   pthread_mutexattr_destroy \
diff --git a/nptl/Versions b/nptl/Versions
index 88c934369f..33ffc5b988 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -88,6 +88,7 @@ libc {
   GLIBC_2.4 {
     pthread_mutex_consistent_np;
     pthread_mutex_getprioceiling;
+    pthread_mutex_setprioceiling;
   }
   GLIBC_2.12 {
     pthread_mutex_consistent;
@@ -127,6 +128,7 @@ libc {
     pthread_kill;
     pthread_mutex_consistent;
     pthread_mutex_getprioceiling;
+    pthread_mutex_setprioceiling;
     pthread_once;
     pthread_rwlock_rdlock;
     pthread_rwlock_unlock;
@@ -321,7 +323,6 @@ libpthread {
   }
 
   GLIBC_2.4 {
-    pthread_mutex_setprioceiling;
     pthread_mutexattr_getprioceiling;
     pthread_mutexattr_getprotocol;
     pthread_mutexattr_getrobust_np;
diff --git a/nptl/pthread_mutex_setprioceiling.c b/nptl/pthread_mutex_setprioceiling.c
index 68755fed46..2675597dfb 100644
--- a/nptl/pthread_mutex_setprioceiling.c
+++ b/nptl/pthread_mutex_setprioceiling.c
@@ -22,11 +22,11 @@
 #include <pthreadP.h>
 #include <atomic.h>
 #include <futex-internal.h>
-
+#include <shlib-compat.h>
 
 int
-pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
-			      int *old_ceiling)
+__pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
+				int *old_ceiling)
 {
   /* See concurrency notes regarding __kind in struct __pthread_mutex_s
      in sysdeps/nptl/bits/thread-shared-types.h.  */
@@ -121,3 +121,10 @@ pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
 
   return 0;
 }
+versioned_symbol (libc, __pthread_mutex_setprioceiling,
+		  pthread_mutex_setprioceiling, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_mutex_setprioceiling,
+               pthread_mutex_setprioceiling, GLIBC_2_4);
+#endif