nptl: Move pthread_rwlockattr_setkind_np into libc

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

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>

64 files changed, 76 insertions, 33 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index d6920dfb25..757e5e4238 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -135,6 +135,7 @@ routines = \
   pthread_rwlockattr_getkind_np \
   pthread_rwlockattr_getpshared \
   pthread_rwlockattr_init \
+  pthread_rwlockattr_setkind_np \
   pthread_self \
   pthread_setcancelstate \
   pthread_setcanceltype \
@@ -190,7 +191,6 @@ libpthread-routines = \
   pthread_getname \
   pthread_join \
   pthread_join_common \
-  pthread_rwlockattr_setkind_np \
   pthread_rwlockattr_setpshared \
   pthread_setaffinity \
   pthread_setattr_default_np \
diff --git a/nptl/Versions b/nptl/Versions
index bc0a9c826a..450c3727ab 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -77,6 +77,7 @@ libc {
     pthread_rwlockattr_getkind_np;
     pthread_rwlockattr_getpshared;
     pthread_rwlockattr_init;
+    pthread_rwlockattr_setkind_np;
   }
   GLIBC_2.2 {
     __pthread_rwlock_destroy;
@@ -234,6 +235,7 @@ libc {
     pthread_rwlockattr_getkind_np;
     pthread_rwlockattr_getpshared;
     pthread_rwlockattr_init;
+    pthread_rwlockattr_setkind_np;
     pthread_setspecific;
     pthread_spin_destroy;
     pthread_spin_init;
@@ -320,7 +322,6 @@ libpthread {
     pthread_attr_setstacksize;
     pthread_create;
     pthread_getconcurrency;
-    pthread_rwlockattr_setkind_np;
     pthread_rwlockattr_setpshared;
     pthread_setconcurrency;
     sem_destroy;
diff --git a/nptl/pthread_rwlockattr_setkind_np.c b/nptl/pthread_rwlockattr_setkind_np.c
index eda7b54bc8..9e13665470 100644
--- a/nptl/pthread_rwlockattr_setkind_np.c
+++ b/nptl/pthread_rwlockattr_setkind_np.c
@@ -18,10 +18,10 @@
 
 #include <errno.h>
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
-pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref)
+__pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref)
 {
   struct pthread_rwlockattr *iattr;
 
@@ -36,3 +36,10 @@ pthread_rwlockattr_setkind_np (pthread_rwlockattr_t *attr, int pref)
 
   return 0;
 }
+versioned_symbol (libc, __pthread_rwlockattr_setkind_np,
+                  pthread_rwlockattr_setkind_np, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_rwlockattr_setkind_np,
+               pthread_rwlockattr_setkind_np, GLIBC_2_1);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 0a2ed94de1..448ae2354b 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1517,6 +1517,7 @@ GLIBC_2.17 pthread_rwlockattr_destroy F
 GLIBC_2.17 pthread_rwlockattr_getkind_np F
 GLIBC_2.17 pthread_rwlockattr_getpshared F
 GLIBC_2.17 pthread_rwlockattr_init F
+GLIBC_2.17 pthread_rwlockattr_setkind_np F
 GLIBC_2.17 pthread_self F
 GLIBC_2.17 pthread_setcancelstate F
 GLIBC_2.17 pthread_setcanceltype F
@@ -2332,6 +2333,7 @@ GLIBC_2.34 pthread_rwlockattr_destroy F
 GLIBC_2.34 pthread_rwlockattr_getkind_np F
 GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
+GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_setspecific F
 GLIBC_2.34 pthread_spin_destroy F
 GLIBC_2.34 pthread_spin_init F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index c1536944e9..fc9870dbfd 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -32,7 +32,6 @@ GLIBC_2.17 pthread_getconcurrency F
 GLIBC_2.17 pthread_getcpuclockid F
 GLIBC_2.17 pthread_getname_np F
 GLIBC_2.17 pthread_join F
-GLIBC_2.17 pthread_rwlockattr_setkind_np F
 GLIBC_2.17 pthread_rwlockattr_setpshared F
 GLIBC_2.17 pthread_setaffinity_np F
 GLIBC_2.17 pthread_setconcurrency F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 72ccbb699d..0468b6e626 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1617,6 +1617,7 @@ GLIBC_2.1 pthread_rwlockattr_destroy F
 GLIBC_2.1 pthread_rwlockattr_getkind_np F
 GLIBC_2.1 pthread_rwlockattr_getpshared F
 GLIBC_2.1 pthread_rwlockattr_init F
+GLIBC_2.1 pthread_rwlockattr_setkind_np F
 GLIBC_2.1 ptsname F
 GLIBC_2.1 ptsname_r F
 GLIBC_2.1 putgrent F
@@ -2413,6 +2414,7 @@ GLIBC_2.34 pthread_rwlockattr_destroy F
 GLIBC_2.34 pthread_rwlockattr_getkind_np F
 GLIBC_2.34 pthread_rwlockattr_getpshared F
 GLIBC_2.34 pthread_rwlockattr_init F
+GLIBC_2.34 pthread_rwlockattr_setkind_np F
 GLIBC_2.34 pthread_setspecific F
 GLIBC_2.34 pthread_spin_destroy F
 GLIBC_2.34 pthread_spin_init F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index d49bd08365..c7415ed0f4 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -24,7 +24,6 @@ GLIBC_2.1 pthread_attr_setstackaddr F
 GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
-GLIBC_2.1 pthread_rwlockattr_setkind_np F
 GLIBC_2.1 pthread_rwlockattr_setpshared F
 GLIBC_2.1 pthread_setconcurrency F
 GLIBC_2.1 sem_destroy F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 36ed3ce16d..0845c61588 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1460,6 +1460,7 @@ GLIBC_2.32 pthread_rwlockattr_destroy F
 GLIBC_2.32 pthread_rwlockattr_getkind_np F
 GLIBC_2.32 pthread_rwlockattr_getpshared F
 GLIBC_2.32 pthread_rwlockattr_init F
+GLIBC_2.32 pthread_rwlockattr_setkind_np F
 GLIBC_2.32 pthread_self F
 GLIBC_2.32 pthread_setcancelstate F