nptl: Move pthread_barrierattr_init into libc

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

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

64 files changed, 76 insertions, 33 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index 404242feb1..3418ab6885 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -77,6 +77,7 @@ routines = \
   pthread_barrier_init \
   pthread_barrier_wait \
   pthread_barrierattr_destroy \
+  pthread_barrierattr_init \
   pthread_cleanup_upto \
   pthread_cond_broadcast \
   pthread_cond_destroy \
@@ -192,7 +193,6 @@ libpthread-routines = \
   pthread_attr_setstackaddr \
   pthread_attr_setstacksize \
   pthread_barrierattr_getpshared \
-  pthread_barrierattr_init \
   pthread_barrierattr_setpshared \
   pthread_cancel \
   pthread_clockjoin \
diff --git a/nptl/Versions b/nptl/Versions
index 0b5ce84f6e..42141ec1b1 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -110,6 +110,7 @@ libc {
     pthread_barrier_init;
     pthread_barrier_wait;
     pthread_barrierattr_destroy;
+    pthread_barrierattr_init;
     pthread_condattr_getpshared;
     pthread_condattr_setpshared;
     pthread_mutex_timedlock;
@@ -226,6 +227,7 @@ libc {
     pthread_barrier_init;
     pthread_barrier_wait;
     pthread_barrierattr_destroy;
+    pthread_barrierattr_init;
     pthread_cond_clockwait;
     pthread_condattr_getclock;
     pthread_condattr_getpshared;
@@ -377,7 +379,6 @@ libpthread {
   GLIBC_2.2 {
     pthread_attr_getstack;
     pthread_attr_setstack;
-    pthread_barrierattr_init;
     pthread_barrierattr_setpshared;
     pthread_getcpuclockid;
     pthread_yield;
diff --git a/nptl/pthread_barrierattr_init.c b/nptl/pthread_barrierattr_init.c
index 4a916cf1de..60305208e3 100644
--- a/nptl/pthread_barrierattr_init.c
+++ b/nptl/pthread_barrierattr_init.c
@@ -17,10 +17,10 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
-pthread_barrierattr_init (pthread_barrierattr_t *attr)
+__pthread_barrierattr_init (pthread_barrierattr_t *attr)
 {
   ASSERT_TYPE_SIZE (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T);
   ASSERT_PTHREAD_INTERNAL_SIZE (pthread_barrierattr_t,
@@ -30,3 +30,10 @@ pthread_barrierattr_init (pthread_barrierattr_t *attr)
 
   return 0;
 }
+versioned_symbol (libc, __pthread_barrierattr_init,
+                  pthread_barrierattr_init, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_barrierattr_init,
+               pthread_barrierattr_init, GLIBC_2_2);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 78871f1aa4..4ee4c568cc 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1459,6 +1459,7 @@ GLIBC_2.17 pthread_barrier_destroy F
 GLIBC_2.17 pthread_barrier_init F
 GLIBC_2.17 pthread_barrier_wait F
 GLIBC_2.17 pthread_barrierattr_destroy F
+GLIBC_2.17 pthread_barrierattr_init F
 GLIBC_2.17 pthread_cond_broadcast F
 GLIBC_2.17 pthread_cond_destroy F
 GLIBC_2.17 pthread_cond_init F
@@ -2313,6 +2314,7 @@ GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
 GLIBC_2.34 pthread_barrierattr_destroy F
+GLIBC_2.34 pthread_barrierattr_init F
 GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_condattr_getclock F
 GLIBC_2.34 pthread_condattr_getpshared F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index d7d512a460..e30f477dba 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -19,7 +19,6 @@ GLIBC_2.17 pthread_attr_setstack F
 GLIBC_2.17 pthread_attr_setstackaddr F
 GLIBC_2.17 pthread_attr_setstacksize F
 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_create F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index b4386b4427..f143abec4d 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2012,6 +2012,7 @@ GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
 GLIBC_2.2 pthread_barrierattr_destroy F
+GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_condattr_getpshared F
 GLIBC_2.2 pthread_condattr_setpshared F
 GLIBC_2.2 pthread_mutex_timedlock F
@@ -2400,6 +2401,7 @@ GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
 GLIBC_2.34 pthread_barrierattr_destroy F
+GLIBC_2.34 pthread_barrierattr_init F
 GLIBC_2.34 pthread_cond_clockwait F
 GLIBC_2.34 pthread_condattr_getclock F
 GLIBC_2.34 pthread_condattr_getpshared F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 418ff6136d..acc5419ea1 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -27,7 +27,6 @@ GLIBC_2.18 pthread_getattr_default_np F
 GLIBC_2.18 pthread_setattr_default_np F
 GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_setstack F
-GLIBC_2.2 pthread_barrierattr_init F
 GLIBC_2.2 pthread_barrierattr_setpshared F
 GLIBC_2.2 pthread_getcpuclockid F
 GLIBC_2.2.3 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 9f8ef3f892..c9f8b47a5e 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1398,6 +1398,7 @@ GLIBC_2.32 pthread_barrier_destroy F
 GLIBC_2.32 pthread_barrier_init F
 GLIBC_2.32 pthread_barrier_wait F
 GLIBC_2.32 pthread_barrierattr_destroy F
+GLIBC_2.32 pthread_barrierattr_init F
 GLIBC_2.32 pthread_cond_broadcast F
 GLIBC_2.32 pthread_cond_clockwait F