nptl: Move pthread_mutexattr_getprotocol into libc

The symbol was moved using scripts/move-symbol-to-libc.py.

64 files changed, 76 insertions, 33 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index b3d547a2eb..8c9cf9ca8a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -105,6 +105,7 @@ routines = \
   pthread_mutex_unlock \
   pthread_mutexattr_destroy \
   pthread_mutexattr_getprioceiling \
+  pthread_mutexattr_getprotocol \
   pthread_once \
   pthread_rwlock_rdlock \
   pthread_rwlock_unlock \
@@ -164,7 +165,6 @@ libpthread-routines = \
   pthread_getname \
   pthread_join \
   pthread_join_common \
-  pthread_mutexattr_getprotocol \
   pthread_mutexattr_getpshared \
   pthread_mutexattr_getrobust \
   pthread_mutexattr_gettype \
diff --git a/nptl/Versions b/nptl/Versions
index fe9c869795..1cb98b843e 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -95,6 +95,7 @@ libc {
     pthread_mutex_getprioceiling;
     pthread_mutex_setprioceiling;
     pthread_mutexattr_getprioceiling;
+    pthread_mutexattr_getprotocol;
   }
   GLIBC_2.12 {
     pthread_mutex_consistent;
@@ -139,6 +140,7 @@ libc {
     pthread_mutex_setprioceiling;
     pthread_mutexattr_destroy;
     pthread_mutexattr_getprioceiling;
+    pthread_mutexattr_getprotocol;
     pthread_once;
     pthread_rwlock_rdlock;
     pthread_rwlock_unlock;
@@ -329,7 +331,6 @@ libpthread {
   }
 
   GLIBC_2.4 {
-    pthread_mutexattr_getprotocol;
     pthread_mutexattr_getrobust_np;
     pthread_mutexattr_setprioceiling;
     pthread_mutexattr_setprotocol;
diff --git a/nptl/pthread_mutexattr_getprotocol.c b/nptl/pthread_mutexattr_getprotocol.c
index f970eab854..685f95a84e 100644
--- a/nptl/pthread_mutexattr_getprotocol.c
+++ b/nptl/pthread_mutexattr_getprotocol.c
@@ -18,10 +18,10 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthreadP.h>
-
+#include <shlib-compat.h>
 
 int
-pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol)
+__pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol)
 {
   const struct pthread_mutexattr *iattr;
 
@@ -32,3 +32,10 @@ pthread_mutexattr_getprotocol (const pthread_mutexattr_t *attr, int *protocol)
 
   return 0;
 }
+versioned_symbol (libc, __pthread_mutexattr_getprotocol,
+		  pthread_mutexattr_getprotocol, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_4, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_mutexattr_getprotocol,
+               pthread_mutexattr_getprotocol, GLIBC_2_4);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 0d9237d4f8..aad015030e 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1479,6 +1479,7 @@ GLIBC_2.17 pthread_mutex_trylock F
 GLIBC_2.17 pthread_mutex_unlock F
 GLIBC_2.17 pthread_mutexattr_destroy F
 GLIBC_2.17 pthread_mutexattr_getprioceiling F
+GLIBC_2.17 pthread_mutexattr_getprotocol F
 GLIBC_2.17 pthread_once F
 GLIBC_2.17 pthread_rwlock_rdlock F
 GLIBC_2.17 pthread_rwlock_unlock F
@@ -2236,6 +2237,7 @@ GLIBC_2.34 pthread_mutex_timedlock F
 GLIBC_2.34 pthread_mutex_trylock F
 GLIBC_2.34 pthread_mutexattr_destroy F
 GLIBC_2.34 pthread_mutexattr_getprioceiling F
+GLIBC_2.34 pthread_mutexattr_getprotocol F
 GLIBC_2.34 pthread_once F
 GLIBC_2.34 pthread_rwlock_rdlock F
 GLIBC_2.34 pthread_rwlock_unlock F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 98aa70d052..193c0e955b 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -45,7 +45,6 @@ GLIBC_2.17 pthread_getcpuclockid F
 GLIBC_2.17 pthread_getname_np F
 GLIBC_2.17 pthread_join F
 GLIBC_2.17 pthread_mutexattr_getkind_np F
-GLIBC_2.17 pthread_mutexattr_getprotocol F
 GLIBC_2.17 pthread_mutexattr_getpshared F
 GLIBC_2.17 pthread_mutexattr_getrobust F
 GLIBC_2.17 pthread_mutexattr_getrobust_np F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 554732ce01..6098d8b09d 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2322,6 +2322,7 @@ GLIBC_2.34 pthread_mutex_timedlock F
 GLIBC_2.34 pthread_mutex_trylock F
 GLIBC_2.34 pthread_mutexattr_destroy F
 GLIBC_2.34 pthread_mutexattr_getprioceiling F
+GLIBC_2.34 pthread_mutexattr_getprotocol F
 GLIBC_2.34 pthread_once F
 GLIBC_2.34 pthread_rwlock_rdlock F
 GLIBC_2.34 pthread_rwlock_unlock F
@@ -2514,6 +2515,7 @@ GLIBC_2.4 pthread_mutex_consistent_np F
 GLIBC_2.4 pthread_mutex_getprioceiling F
 GLIBC_2.4 pthread_mutex_setprioceiling F
 GLIBC_2.4 pthread_mutexattr_getprioceiling F
+GLIBC_2.4 pthread_mutexattr_getprotocol F
 GLIBC_2.4 qecvt F
 GLIBC_2.4 qecvt_r F
 GLIBC_2.4 qfcvt F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index a7e6bdd5c1..ae3ee7ede6 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -131,7 +131,6 @@ GLIBC_2.30 pthread_rwlock_clockrdlock F
 GLIBC_2.30 pthread_rwlock_clockwrlock F
 GLIBC_2.30 sem_clockwait F
 GLIBC_2.31 pthread_clockjoin_np F
-GLIBC_2.4 pthread_mutexattr_getprotocol F
 GLIBC_2.4 pthread_mutexattr_getrobust_np F
 GLIBC_2.4 pthread_mutexattr_setprioceiling F
 GLIBC_2.4 pthread_mutexattr_setprotocol F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 23028736fb..757abd356a 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1407,6 +1407,7 @@ GLIBC_2.32 pthread_mutex_trylock F
 GLIBC_2.32 pthread_mutex_unlock F
 GLIBC_2.32 pthread_mutexattr_destroy F
 GLIBC_2.32 pthread_mutexattr_getprioceiling F
+GLIBC_2.32 pthread_mutexattr_getprotocol F
 GLIBC_2.32 pthread_once F
 GLIBC_2.32 pthread_rwlock_rdlock F
 GLIBC_2.32 pthread_rwlock_unlock F
@@ -1