nptl: Move pthread_attr_getstack into libc

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

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

64 files changed, 74 insertions, 33 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index bb30f01045..945956afb3 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -69,6 +69,7 @@ routines = \
   pthread_attr_getschedpolicy \
   pthread_attr_getscope \
   pthread_attr_getsigmask \
+  pthread_attr_getstack \
   pthread_attr_init \
   pthread_attr_setaffinity \
   pthread_attr_setdetachstate \
@@ -194,7 +195,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_getstack \
   pthread_attr_getstackaddr \
   pthread_attr_getstacksize \
   pthread_attr_setguardsize \
diff --git a/nptl/Versions b/nptl/Versions
index 536d69a588..aa7ae59df7 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -109,6 +109,7 @@ libc {
     __pthread_rwlock_trywrlock;
     __pthread_rwlock_unlock;
     __pthread_rwlock_wrlock;
+    pthread_attr_getstack;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -242,6 +243,7 @@ libc {
     mtx_unlock;
     pthread_attr_getaffinity_np;
     pthread_attr_getguardsize;
+    pthread_attr_getstack;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -409,7 +411,6 @@ libpthread {
   }
 
   GLIBC_2.2 {
-    pthread_attr_getstack;
     pthread_attr_setstack;
     pthread_getcpuclockid;
     pthread_yield;
diff --git a/nptl/pthread_attr_getstack.c b/nptl/pthread_attr_getstack.c
index 570115af10..351aa4da80 100644
--- a/nptl/pthread_attr_getstack.c
+++ b/nptl/pthread_attr_getstack.c
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
 __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
@@ -37,4 +37,9 @@ __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
 
   return 0;
 }
-strong_alias (__pthread_attr_getstack, pthread_attr_getstack)
+versioned_symbol (libpthread, __pthread_attr_getstack,
+                  pthread_attr_getstack, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_getstack,
+               pthread_attr_getstack, GLIBC_2_2);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 889131c5e9..8c255d6ee6 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1450,6 +1450,7 @@ GLIBC_2.17 pthread_attr_getinheritsched F
 GLIBC_2.17 pthread_attr_getschedparam F
 GLIBC_2.17 pthread_attr_getschedpolicy F
 GLIBC_2.17 pthread_attr_getscope F
+GLIBC_2.17 pthread_attr_getstack F
 GLIBC_2.17 pthread_attr_init F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setdetachstate F
@@ -2324,6 +2325,7 @@ 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_attr_getstack 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 dd9aa261f2..a6ff36c62b 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_getstack F
 GLIBC_2.17 pthread_attr_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setguardsize F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 7ae5d0957b..ee156a2cfb 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -2012,6 +2012,7 @@ GLIBC_2.2 posix_spawnattr_setsigmask F
 GLIBC_2.2 posix_spawnp F
 GLIBC_2.2 pread F
 GLIBC_2.2 pread64 F
+GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2412,6 +2413,7 @@ 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_attr_getstack 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 953f2b3bd0..7b1f484f7f 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -15,7 +15,6 @@ GLIBC_2.11 pthread_sigqueue F
 GLIBC_2.12 pthread_getname_np F
 GLIBC_2.12 pthread_setname_np F
 GLIBC_2.18 pthread_getattr_default_np F
-GLIBC_2.2 pthread_attr_getstack F
 GLIBC_2.2 pthread_attr_setstack 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 7acadb4829..0653d3d150 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1388,6 +1388,7 @@ GLIBC_2.32 pthread_attr_getschedparam F
 GLIBC_2.32 pthread_attr_getschedpolicy F
 GLIBC_2.32 pthread_attr_getscope F
 GLIBC_2.32 pthread_attr_getsigmask_np F
+GLIBC_2.32 pthread_attr_getstack F
 GLIBC_2.32 pthread_attr_init F
 GLIBC_2.32 pthread_attr_setaffinity_np F
 GLIBC_2.32 pthread_attr_setdetachstate F
@@ -2083,6 +2084,7 @@ 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_attr_getstack F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_bar