nptl: Move pthread_attr_setstackaddr 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 a4f1e91649..39feea52aa 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -83,6 +83,7 @@ routines = \
   pthread_attr_setsigmask \
   pthread_attr_setsigmask_internal \
   pthread_attr_setstack \
+  pthread_attr_setstackaddr \
   pthread_barrier_destroy \
   pthread_barrier_init \
   pthread_barrier_wait \
@@ -199,7 +200,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_setstackaddr \
   pthread_attr_setstacksize \
   pthread_cancel \
   pthread_create \
diff --git a/nptl/Versions b/nptl/Versions
index b96fadf49f..edf4da4c81 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -77,6 +77,7 @@ libc {
     pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_attr_setguardsize;
+    pthread_attr_setstackaddr;
     pthread_mutexattr_gettype;
     pthread_mutexattr_settype;
     pthread_rwlock_destroy;
@@ -252,6 +253,7 @@ libc {
     pthread_attr_getstacksize;
     pthread_attr_setguardsize;
     pthread_attr_setstack;
+    pthread_attr_setstackaddr;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -400,7 +402,6 @@ libpthread {
   }
 
   GLIBC_2.1 {
-    pthread_attr_setstackaddr;
     pthread_attr_setstacksize;
     pthread_create;
     pthread_getconcurrency;
diff --git a/nptl/pthread_attr_setstackaddr.c b/nptl/pthread_attr_setstackaddr.c
index 08633b551d..328339e364 100644
--- a/nptl/pthread_attr_setstackaddr.c
+++ b/nptl/pthread_attr_setstackaddr.c
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
 __pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr)
@@ -36,7 +36,12 @@ __pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr)
 
   return 0;
 }
-strong_alias (__pthread_attr_setstackaddr, pthread_attr_setstackaddr)
+versioned_symbol (libc, __pthread_attr_setstackaddr,
+                  pthread_attr_setstackaddr, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_setstackaddr,
+               pthread_attr_setstackaddr, GLIBC_2_1);
+#endif
 
 link_warning (pthread_attr_setstackaddr,
               "the use of `pthread_attr_setstackaddr' is deprecated, use `pthread_attr_setstack'")
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index 364b9950c7..b19a5a5501 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1462,6 +1462,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_attr_setstack F
+GLIBC_2.17 pthread_attr_setstackaddr F
 GLIBC_2.17 pthread_barrier_destroy F
 GLIBC_2.17 pthread_barrier_init F
 GLIBC_2.17 pthread_barrier_wait F
@@ -2334,6 +2335,7 @@ GLIBC_2.34 pthread_attr_getstackaddr F
 GLIBC_2.34 pthread_attr_getstacksize F
 GLIBC_2.34 pthread_attr_setguardsize F
 GLIBC_2.34 pthread_attr_setstack F
+GLIBC_2.34 pthread_attr_setstackaddr 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 c1b7d745b9..4163b52df4 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_setstackaddr F
 GLIBC_2.17 pthread_attr_setstacksize 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 db10ee7331..ad8a53e384 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1617,6 +1617,7 @@ GLIBC_2.1 pthread_attr_getstackaddr F
 GLIBC_2.1 pthread_attr_getstacksize F
 GLIBC_2.1 pthread_attr_init F
 GLIBC_2.1 pthread_attr_setguardsize F
+GLIBC_2.1 pthread_attr_setstackaddr F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2423,6 +2424,7 @@ GLIBC_2.34 pthread_attr_getstackaddr F
 GLIBC_2.34 pthread_attr_getstacksize F
 GLIBC_2.34 pthread_attr_setguardsize F
 GLIBC_2.34 pthread_attr_setstack F
+GLIBC_2.34 pthread_attr_setstackaddr 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 01a845ca81..253b9f924f 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_setstackaddr F
 GLIBC_2.1 pthread_attr_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 0fb7ff6624..85ecbfba6a 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1401,6 +1401,7 @@ GLIBC_2.32 pthread_attr_setschedpolicy F
 GLIBC_2.32 pthread_attr_setscope F
 GLIBC_2.32 pthread_attr_setsigmask_np F
 GLIBC_2.32 pthread_attr_setstack F
+GLIBC_2.32 pthread_attr_setstackaddr F
 GLIBC_2.32 pthread_barrier_destroy F
 GLIBC_2.32 pthread_barrier_init F
 GLIBC_2.32 pthread_barrier_wait F
@@ -2093,6 +2094,7 @@ GLIBC_2.34 pthread_attr_getstackaddr F
 GLIBC_2.34 pthread_attr_getstacksize F<