nptl: Move pthread_attr_getstackaddr 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 945956afb3..0844b5203b 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -70,6 +70,7 @@ routines = \
   pthread_attr_getscope \
   pthread_attr_getsigmask \
   pthread_attr_getstack \
+  pthread_attr_getstackaddr \
   pthread_attr_init \
   pthread_attr_setaffinity \
   pthread_attr_setdetachstate \
@@ -195,7 +196,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_getstackaddr \
   pthread_attr_getstacksize \
   pthread_attr_setguardsize \
   pthread_attr_setstack \
diff --git a/nptl/Versions b/nptl/Versions
index aa7ae59df7..541f0a1ff0 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -73,6 +73,7 @@ libc {
   }
   GLIBC_2.1 {
     pthread_attr_getguardsize;
+    pthread_attr_getstackaddr;
     pthread_attr_init;
     pthread_mutexattr_gettype;
     pthread_mutexattr_settype;
@@ -244,6 +245,7 @@ libc {
     pthread_attr_getaffinity_np;
     pthread_attr_getguardsize;
     pthread_attr_getstack;
+    pthread_attr_getstackaddr;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -392,7 +394,6 @@ libpthread {
   }
 
   GLIBC_2.1 {
-    pthread_attr_getstackaddr;
     pthread_attr_getstacksize;
     pthread_attr_setguardsize;
     pthread_attr_setstackaddr;
diff --git a/nptl/pthread_attr_getstackaddr.c b/nptl/pthread_attr_getstackaddr.c
index e3e51c9131..b245ae95c7 100644
--- a/nptl/pthread_attr_getstackaddr.c
+++ b/nptl/pthread_attr_getstackaddr.c
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
 __pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
@@ -34,7 +34,12 @@ __pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
 
   return 0;
 }
-strong_alias (__pthread_attr_getstackaddr, pthread_attr_getstackaddr)
+versioned_symbol (libc, __pthread_attr_getstackaddr,
+                  pthread_attr_getstackaddr, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_getstackaddr,
+               pthread_attr_getstackaddr, GLIBC_2_1);
+#endif
 
 link_warning (pthread_attr_getstackaddr,
               "the use of `pthread_attr_getstackaddr' is deprecated, use `pthread_attr_getstack'")
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 8c255d6ee6..8ec95fcd8f 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1451,6 +1451,7 @@ 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_getstackaddr F
 GLIBC_2.17 pthread_attr_init F
 GLIBC_2.17 pthread_attr_setaffinity_np F
 GLIBC_2.17 pthread_attr_setdetachstate F
@@ -2326,6 +2327,7 @@ 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_attr_getstackaddr 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 a6ff36c62b..73434af8dd 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_getstackaddr F
 GLIBC_2.17 pthread_attr_getstacksize F
 GLIBC_2.17 pthread_attr_setguardsize F
 GLIBC_2.17 pthread_attr_setstack F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index ee156a2cfb..6cdf7d6baa 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1613,6 +1613,7 @@ 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_getstackaddr F
 GLIBC_2.1 pthread_attr_init F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
@@ -2414,6 +2415,7 @@ 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_attr_getstackaddr 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 7b1f484f7f..0d7787af1d 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_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
 GLIBC_2.1 pthread_attr_setguardsize F
 GLIBC_2.1 pthread_attr_setstackaddr F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 0653d3d150..0a322ae797 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1389,6 +1389,7 @@ 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_getstackaddr F
 GLIBC_2.32 pthread_attr_init F
 GLIBC_2.32 pthread_attr_setaffinity_np F
 GLIBC_2.32 pthread_attr_setdetachstate F
@@ -2085,6 +2086,7 @@ GLIBC_2.34 mtx_unlock F
 GLIBC_2.34 pthread_attr_getaffinity_np F
 GLIBC