nptl: Move pthread_condattr_getclock into libc

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

64 files changed, 77 insertions, 33 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index 99a54ff975..b7903bdc33 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -80,6 +80,7 @@ routines = \
   pthread_cond_signal \
   pthread_cond_wait \
   pthread_condattr_destroy \
+  pthread_condattr_getclock \
   pthread_condattr_init \
   pthread_equal \
   pthread_exit \
@@ -162,7 +163,6 @@ libpthread-routines = \
   pthread_barrierattr_setpshared \
   pthread_cancel \
   pthread_clockjoin \
-  pthread_condattr_getclock \
   pthread_condattr_getpshared \
   pthread_condattr_setclock \
   pthread_condattr_setpshared \
diff --git a/nptl/Versions b/nptl/Versions
index 87412e674a..962f3ae1dc 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -94,6 +94,7 @@ libc {
     __pthread_cleanup_routine;
     __pthread_unwind_next;
     pthread_attr_setaffinity_np;
+    pthread_condattr_getclock;
     pthread_getaffinity_np;
   }
   GLIBC_2.3.4 {
@@ -147,6 +148,7 @@ libc {
     __pthread_once;
     __pthread_setspecific;
     pthread_cond_clockwait;
+    pthread_condattr_getclock;
     pthread_getspecific;
     pthread_key_create;
     pthread_key_delete;
@@ -332,7 +334,6 @@ libpthread {
     __pthread_unregister_cancel_restore;
     pthread_attr_getaffinity_np;
     pthread_barrierattr_getpshared;
-    pthread_condattr_getclock;
     pthread_condattr_setclock;
     pthread_setaffinity_np;
     pthread_timedjoin_np;
diff --git a/nptl/pthread_condattr_getclock.c b/nptl/pthread_condattr_getclock.c
index 64a92a14cb..ad5655dbce 100644
--- a/nptl/pthread_condattr_getclock.c
+++ b/nptl/pthread_condattr_getclock.c
@@ -17,12 +17,20 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
-pthread_condattr_getclock (const pthread_condattr_t *attr, clockid_t *clock_id)
+__pthread_condattr_getclock (const pthread_condattr_t *attr,
+			      clockid_t *clock_id)
 {
   *clock_id = (((((const struct pthread_condattr *) attr)->value) >> 1)
 	       & ((1 << COND_CLOCK_BITS) - 1));
   return 0;
 }
+versioned_symbol (libc, __pthread_condattr_getclock,
+		  pthread_condattr_getclock, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_3_3, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_condattr_getclock,
+	       pthread_condattr_getclock, GLIBC_2_3_3);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 61efeac09f..58dc5cbe9d 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1458,6 +1458,7 @@ GLIBC_2.17 pthread_cond_signal F
 GLIBC_2.17 pthread_cond_timedwait F
 GLIBC_2.17 pthread_cond_wait F
 GLIBC_2.17 pthread_condattr_destroy F
+GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_init F
 GLIBC_2.17 pthread_equal F
 GLIBC_2.17 pthread_exit F
@@ -2242,6 +2243,7 @@ GLIBC_2.34 __pthread_once F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
 GLIBC_2.34 pthread_cond_clockwait F
+GLIBC_2.34 pthread_condattr_getclock F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 67ddfcd72e..5cc800e1b6 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_barrierattr_getpshared F
 GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_barrierattr_setpshared F
 GLIBC_2.17 pthread_cancel F
-GLIBC_2.17 pthread_condattr_getclock F
 GLIBC_2.17 pthread_condattr_getpshared F
 GLIBC_2.17 pthread_condattr_setclock F
 GLIBC_2.17 pthread_condattr_setpshared F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 406729fee6..4894eaf971 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2212,6 +2212,7 @@ GLIBC_2.3.3 inet6_option_space F
 GLIBC_2.3.3 nftw F
 GLIBC_2.3.3 nftw64 F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
+GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_getaffinity_np F
 GLIBC_2.3.3 remap_file_pages F
 GLIBC_2.3.3 sched_getaffinity F
@@ -2323,6 +2324,7 @@ GLIBC_2.34 __pthread_once F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
 GLIBC_2.34 pthread_cond_clockwait F
+GLIBC_2.34 pthread_condattr_getclock F
 GLIBC_2.34 pthread_getspecific F
 GLIBC_2.34 pthread_key_create F
 GLIBC_2.34 pthread_key_delete F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index ad49b0fdb5..923388f859 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -108,7 +108,6 @@ GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
 GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
-GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index e14a37b8ee..4945ae0dcd 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1385,6 +1385,7 @@ GLIBC_2.32 pthread_cond_signal F
 GLIBC_2.32 pthread_cond_timedwait F
 GLIBC_2.32 pthread_cond_wait F
 GLIBC_2.32 pthread_condattr_destroy F
+GLIBC_2.32 pthread_condattr_getclock F
 GLIBC_2.32 pthread_condattr_init F
 GLIBC_2.32 pthread_equal F
 GLIBC_2.32 pthread_exit F
@@ -2001,6 +2002,7 @@ GLIBC_2.34 __pthread_once F
 GLIBC_2.34 __pthread_setspecific F
 GLIBC_2.34 __pthread_unwind_next F
 GLIBC_2.34 pth