nptl: Move pthread_barrier_init into libc

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

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

65 files changed, 83 insertions, 35 deletions

diff --git a/include/pthread.h b/include/pthread.h
index 858c869a16..a3e1cf51b0 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -8,6 +8,9 @@ extern int __pthread_barrier_init (pthread_barrier_t *__restrict __barrier,
 				 const pthread_barrierattr_t *__restrict
 				 __attr, unsigned int __count)
      __THROW __nonnull ((1));
+#if PTHREAD_IN_LIBC
+libc_hidden_proto (__pthread_barrier_init)
+#endif
 extern int __pthread_barrier_wait (pthread_barrier_t *__barrier)
      __THROWNL __nonnull ((1));
 
diff --git a/nptl/Makefile b/nptl/Makefile
index f9cb1e2b99..54cf04b03a 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -74,6 +74,7 @@ routines = \
   pthread_attr_setsigmask \
   pthread_attr_setsigmask_internal \
   pthread_barrier_destroy \
+  pthread_barrier_init \
   pthread_cleanup_upto \
   pthread_cond_broadcast \
   pthread_cond_destroy \
@@ -188,7 +189,6 @@ libpthread-routines = \
   pthread_attr_setstack \
   pthread_attr_setstackaddr \
   pthread_attr_setstacksize \
-  pthread_barrier_init \
   pthread_barrier_wait \
   pthread_barrierattr_destroy \
   pthread_barrierattr_getpshared \
diff --git a/nptl/Versions b/nptl/Versions
index b7a08a56a7..4716c3f693 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -107,6 +107,7 @@ libc {
     __pthread_rwlock_unlock;
     __pthread_rwlock_wrlock;
     pthread_barrier_destroy;
+    pthread_barrier_init;
     pthread_condattr_getpshared;
     pthread_condattr_setpshared;
     pthread_mutex_timedlock;
@@ -220,6 +221,7 @@ libc {
     mtx_trylock;
     mtx_unlock;
     pthread_barrier_destroy;
+    pthread_barrier_init;
     pthread_cond_clockwait;
     pthread_condattr_getclock;
     pthread_condattr_getpshared;
@@ -309,6 +311,7 @@ libc {
     __pthread_attr_init;
     __pthread_attr_setaffinity_np;
     __pthread_attr_setsigmask_internal;
+    __pthread_barrier_init;
     __pthread_cleanup_pop;
     __pthread_cleanup_push;
     __pthread_cleanup_upto;
@@ -369,7 +372,6 @@ libpthread {
   GLIBC_2.2 {
     pthread_attr_getstack;
     pthread_attr_setstack;
-    pthread_barrier_init;
     pthread_barrier_wait;
     pthread_barrierattr_destroy;
     pthread_barrierattr_init;
@@ -446,7 +448,6 @@ libpthread {
 
   GLIBC_PRIVATE {
     __libpthread_freeres;
-    __pthread_barrier_init;
     __pthread_barrier_wait;
     __pthread_clock_gettime;
     __pthread_clock_settime;
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c
index b14243e618..3a13d2a756 100644
--- a/nptl/pthread_barrier_init.c
+++ b/nptl/pthread_barrier_init.c
@@ -20,7 +20,7 @@
 #include "pthreadP.h"
 #include <futex-internal.h>
 #include <kernel-features.h>
-
+#include <shlib-compat.h>
 
 static const struct pthread_barrierattr default_barrierattr =
   {
@@ -29,7 +29,7 @@ static const struct pthread_barrierattr default_barrierattr =
 
 
 int
-__pthread_barrier_init (pthread_barrier_t *barrier,
+___pthread_barrier_init (pthread_barrier_t *barrier,
 			const pthread_barrierattr_t *attr, unsigned int count)
 {
   ASSERT_TYPE_SIZE (pthread_barrier_t, __SIZEOF_PTHREAD_BARRIER_T);
@@ -61,4 +61,13 @@ __pthread_barrier_init (pthread_barrier_t *barrier,
 
   return 0;
 }
-weak_alias (__pthread_barrier_init, pthread_barrier_init)
+versioned_symbol (libc, ___pthread_barrier_init, pthread_barrier_init,
+                  GLIBC_2_34);
+versioned_symbol (libc, ___pthread_barrier_init, __pthread_barrier_init,
+                  GLIBC_PRIVATE);
+libc_hidden_ver (___pthread_barrier_init, __pthread_barrier_init)
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libpthread, ___pthread_barrier_init, pthread_barrier_init,
+               GLIBC_2_2);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 05809cd844..d41347f053 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1456,6 +1456,7 @@ GLIBC_2.17 pthread_attr_setschedparam F
 GLIBC_2.17 pthread_attr_setschedpolicy F
 GLIBC_2.17 pthread_attr_setscope F
 GLIBC_2.17 pthread_barrier_destroy F
+GLIBC_2.17 pthread_barrier_init F
 GLIBC_2.17 pthread_cond_broadcast F
 GLIBC_2.17 pthread_cond_destroy F
 GLIBC_2.17 pthread_cond_init F
@@ -2307,6 +2308,7 @@ GLIBC_2.34 mtx_timedlock F
 GLIBC_2.34 mtx_trylock F
 GLIBC_2.34 mtx_unlock F
 GLIBC_2.34 pthread_barrier_destroy F
+GLIBC_2.34 pthread_barrier_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 8ed76c3770..3c3cd18252 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -18,7 +18,6 @@ GLIBC_2.17 pthread_attr_setguardsize F
 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_barrier_init F
 GLIBC_2.17 pthread_barrier_wait F
 GLIBC_2.17 pthread_barrierattr_destroy F
 GLIBC_2.17 pthread_barrierattr_getpshared F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index d2b88a842a..ea3e38b25d 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2009,6 +2009,7 @@ GLIBC_2.2 posix_spawnp F
 GLIBC_2.2 pread F
 GLIBC_2.2 pread64 F
 GLIBC_2.2 pthread_barrier_destroy F
+GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_condattr_getpshared F