nptl: Move pthread_attr_getguardsize into libc

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

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

64 files changed, 75 insertions, 33 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index d55f8c6b00..bb30f01045 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -63,6 +63,7 @@ routines = \
   pthread_attr_extension \
   pthread_attr_getaffinity \
   pthread_attr_getdetachstate \
+  pthread_attr_getguardsize \
   pthread_attr_getinheritsched \
   pthread_attr_getschedparam \
   pthread_attr_getschedpolicy \
@@ -193,7 +194,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_getguardsize \
   pthread_attr_getstack \
   pthread_attr_getstackaddr \
   pthread_attr_getstacksize \
diff --git a/nptl/Versions b/nptl/Versions
index d36c2b12ea..536d69a588 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -72,6 +72,7 @@ libc {
     sem_wait;
   }
   GLIBC_2.1 {
+    pthread_attr_getguardsize;
     pthread_attr_init;
     pthread_mutexattr_gettype;
     pthread_mutexattr_settype;
@@ -240,6 +241,7 @@ libc {
     mtx_trylock;
     mtx_unlock;
     pthread_attr_getaffinity_np;
+    pthread_attr_getguardsize;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -388,7 +390,6 @@ libpthread {
   }
 
   GLIBC_2.1 {
-    pthread_attr_getguardsize;
     pthread_attr_getstackaddr;
     pthread_attr_getstacksize;
     pthread_attr_setguardsize;
diff --git a/nptl/pthread_attr_getguardsize.c b/nptl/pthread_attr_getguardsize.c
index a59bc9b283..485bd4c2df 100644
--- a/nptl/pthread_attr_getguardsize.c
+++ b/nptl/pthread_attr_getguardsize.c
@@ -17,10 +17,10 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
-pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
+__pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
 {
   struct pthread_attr *iattr;
 
@@ -30,3 +30,9 @@ pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
 
   return 0;
 }
+versioned_symbol (libpthread, __pthread_attr_getguardsize,
+                  pthread_attr_getguardsize, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_getguardsize,
+               pthread_attr_getguardsize, GLIBC_2_1);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index d58913efca..889131c5e9 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1445,6 +1445,7 @@ GLIBC_2.17 psignal F
 GLIBC_2.17 pthread_attr_destroy F
 GLIBC_2.17 pthread_attr_getaffinity_np F
 GLIBC_2.17 pthread_attr_getdetachstate F
+GLIBC_2.17 pthread_attr_getguardsize F
 GLIBC_2.17 pthread_attr_getinheritsched F
 GLIBC_2.17 pthread_attr_getschedparam F
 GLIBC_2.17 pthread_attr_getschedpolicy F
@@ -2322,6 +2323,7 @@ GLIBC_2.34 mtx_timedlock F
 GLIBC_2.34 mtx_trylock F
 GLIBC_2.34 mtx_unlock F
 GLIBC_2.34 pthread_attr_getaffinity_np F
+GLIBC_2.34 pthread_attr_getguardsize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index bdfd3a52d5..dd9aa261f2 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -3,7 +3,6 @@ GLIBC_2.17 __pthread_register_cancel F
 GLIBC_2.17 __pthread_register_cancel_defer F
 GLIBC_2.17 __pthread_unregister_cancel F
 GLIBC_2.17 __pthread_unregister_cancel_restore F
-GLIBC_2.17 pthread_attr_getguardsize F
 GLIBC_2.17 pthread_attr_getstack F
 GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 78a0b961ea..7ae5d0957b 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1612,6 +1612,7 @@ GLIBC_2.1 pread F
 GLIBC_2.1 pread64 F
 GLIBC_2.1 printf_size F
 GLIBC_2.1 printf_size_info F
+GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_init F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
@@ -2410,6 +2411,7 @@ GLIBC_2.34 mtx_timedlock F
 GLIBC_2.34 mtx_trylock F
 GLIBC_2.34 mtx_unlock F
 GLIBC_2.34 pthread_attr_getaffinity_np F
+GLIBC_2.34 pthread_attr_getguardsize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 2bd86d6130..953f2b3bd0 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -1,7 +1,6 @@
 GLIBC_2.0 __errno_location F
 GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
-GLIBC_2.1 pthread_attr_getguardsize F
 GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
 GLIBC_2.1 pthread_attr_setguardsize F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index e372c9bc17..7acadb4829 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1382,6 +1382,7 @@ GLIBC_2.32 psignal F
 GLIBC_2.32 pthread_attr_destroy F
 GLIBC_2.32 pthread_attr_getaffinity_np F
 GLIBC_2.32 pthread_attr_getdetachstate F
+GLIBC_2.32 pthread_attr_getguardsize F
 GLIBC_2.32 pthread_attr_getinheritsched F
 GLIBC_2.32 pthread_attr_getschedparam F
 GLIBC_2.32 pthread_attr_getschedpolicy F
@@ -2081,6 +2082,7 @@ GLIBC_2.34 mtx_timedlock F
 GLIBC_2.34 mtx_trylock F
 GLIBC_2.34 mtx_unlock F
 GLIBC_2.34 pthread_attr_getaffinity_np F
+GLIBC_2.34