diff --git a/nptl/Makefile b/nptl/Makefile
index af354b2408..ef19ef6019 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -80,6 +80,7 @@ routines = \
   pthread_attr_setsigmask \
   pthread_attr_setsigmask_internal \
   pthread_attr_setstack \
+  pthread_attr_setstackaddr \
   pthread_barrier_destroy \
   pthread_barrier_init \
   pthread_barrier_wait \
@@ -193,7 +194,6 @@ libpthread-routines = \
   nptl-init \
   nptlfreeres \
   pt-interp \
-  pthread_attr_setstackaddr \
   pthread_attr_setstacksize \
   pthread_cancel \
   pthread_clockjoin \
diff --git a/nptl/Versions b/nptl/Versions
index ae3e1cfdfa..c21838991d 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -75,6 +75,7 @@ libc {
     pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_attr_setguardsize;
+    pthread_attr_setstackaddr;
     pthread_mutexattr_gettype;
     pthread_mutexattr_settype;
     pthread_rwlock_destroy;
@@ -240,6 +241,7 @@ libc {
     pthread_attr_getstacksize;
     pthread_attr_setguardsize;
     pthread_attr_setstack;
+    pthread_attr_setstackaddr;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -378,7 +380,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 479d29b00b..e5f9e8be30 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
@@ -2326,6 +2327,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 d052ecdf93..e68d5478b9 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.17 __pthread_unregister_cancel_restore F
 GLIBC_2.17 flockfile F
 GLIBC_2.17 ftrylockfile F
 GLIBC_2.17 funlockfile 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 83972c05b5..aa8f517a17 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1615,6 +1615,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
@@ -2415,6 +2416,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 b48d5eece8..bc250db1a7 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join 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 28c024ec4e..0b0f3e9cde 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
@@ -2085,6 +2086,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/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
index 7fa720fe37..b36a6d141d 100644
--- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.32 __pthread_unregister_cancel_restore F
 GLIBC_2.32 flockfile F
 GLIBC_2.32 ftrylockfile F
 GLIBC_2.32 funlockfile F
-GLIBC_2.32 pthread_attr_setstackaddr F
 GLIBC_2.32 pthread_attr_setstacksize F
 GLIBC_2.32 pthread_cancel F
 GLIBC_2.32 pthread_clockjoin_np F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index 9c37b17967..c90d4addc0 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -208,6 +208,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
@@ -1681,6 +1682,7 @@ GLIBC_2.4 pthread_attr_setschedparam F
 GLIBC_2.4 pthread_attr_setschedpolicy F
 GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
+GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_barrier_destroy F
 GLIBC_2.4 pthread_barrier_init F
 GLIBC_2.4 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
index ac7944dc40..c16aa7efe8 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libpthread.abilist
@@ -20,7 +20,6 @@ GLIBC_2.4 __pthread_unregister_cancel_restore F
 GLIBC_2.4 flockfile F
 GLIBC_2.4 ftrylockfile F
 GLIBC_2.4 funlockfile F
-GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index 3a3c5abfd6..a322949e5d 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -205,6 +205,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
@@ -1678,6 +1679,7 @@ GLIBC_2.4 pthread_attr_setschedparam F
 GLIBC_2.4 pthread_attr_setschedpolicy F
 GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
+GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_barrier_destroy F
 GLIBC_2.4 pthread_barrier_init F
 GLIBC_2.4 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
index ac7944dc40..c16aa7efe8 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libpthread.abilist
@@ -20,7 +20,6 @@ GLIBC_2.4 __pthread_unregister_cancel_restore F
 GLIBC_2.4 flockfile F
 GLIBC_2.4 ftrylockfile F
 GLIBC_2.4 funlockfile F
-GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index 70574bf065..ce958b3b6a 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -1462,6 +1462,7 @@ GLIBC_2.29 pthread_attr_setschedparam F
 GLIBC_2.29 pthread_attr_setschedpolicy F
 GLIBC_2.29 pthread_attr_setscope F
 GLIBC_2.29 pthread_attr_setstack F
+GLIBC_2.29 pthread_attr_setstackaddr F
 GLIBC_2.29 pthread_barrier_destroy F
 GLIBC_2.29 pthread_barrier_init F
 GLIBC_2.29 pthread_barrier_wait F
@@ -2269,6 +2270,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/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
index 9d4f5d9d17..010d6a21f4 100644
--- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.29 __pthread_unregister_cancel_restore F
 GLIBC_2.29 flockfile F
 GLIBC_2.29 ftrylockfile F
 GLIBC_2.29 funlockfile F
-GLIBC_2.29 pthread_attr_setstackaddr F
 GLIBC_2.29 pthread_attr_setstacksize F
 GLIBC_2.29 pthread_cancel F
 GLIBC_2.29 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index bc4a234529..474e765586 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1288,6 +1288,7 @@ GLIBC_2.2 pthread_attr_setschedparam F
 GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2221,6 +2222,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/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
index c4da8bd75e..96eae4e266 100644
--- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist
@@ -10,7 +10,6 @@ GLIBC_2.2 __errno_location F
 GLIBC_2.2 flockfile F
 GLIBC_2.2 ftrylockfile F
 GLIBC_2.2 funlockfile F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index 73e6059763..b952ed800a 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -1583,6 +1583,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
@@ -2404,6 +2405,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/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
index 2ddd93c4a9..0c565f95a8 100644
--- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join 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/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index 3fc8662110..c10f16bd1a 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1309,6 +1309,7 @@ GLIBC_2.2 pthread_attr_setschedparam F
 GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2256,6 +2257,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/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
index 453d496ff4..b651032192 100644
--- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist
@@ -10,7 +10,6 @@ GLIBC_2.2 __errno_location F
 GLIBC_2.2 flockfile F
 GLIBC_2.2 ftrylockfile F
 GLIBC_2.2 funlockfile F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index e0d92c6f84..b9159fa39b 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -209,6 +209,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
@@ -1661,6 +1662,7 @@ GLIBC_2.4 pthread_attr_setschedparam F
 GLIBC_2.4 pthread_attr_setschedpolicy F
 GLIBC_2.4 pthread_attr_setscope F
 GLIBC_2.4 pthread_attr_setstack F
+GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_barrier_destroy F
 GLIBC_2.4 pthread_barrier_init F
 GLIBC_2.4 pthread_barrier_wait F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
index ac7944dc40..c16aa7efe8 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist
@@ -20,7 +20,6 @@ GLIBC_2.4 __pthread_unregister_cancel_restore F
 GLIBC_2.4 flockfile F
 GLIBC_2.4 ftrylockfile F
 GLIBC_2.4 funlockfile F
-GLIBC_2.4 pthread_attr_setstackaddr F
 GLIBC_2.4 pthread_attr_setstacksize F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index 156373feee..c5f0f07dc4 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1579,6 +1579,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
@@ -2347,6 +2348,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/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
index 2ddd93c4a9..0c565f95a8 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join 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/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 36f6d0a70c..3390306d84 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -1464,6 +1464,7 @@ GLIBC_2.18 pthread_attr_setschedparam F
 GLIBC_2.18 pthread_attr_setschedpolicy F
 GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
+GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_barrier_destroy F
 GLIBC_2.18 pthread_barrier_init F
 GLIBC_2.18 pthread_barrier_wait F
@@ -2320,6 +2321,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/microblaze/be/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
index 3c3109fe29..087a16a383 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.18 __pthread_unregister_cancel_restore F
 GLIBC_2.18 flockfile F
 GLIBC_2.18 ftrylockfile F
 GLIBC_2.18 funlockfile F
-GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_attr_setstacksize F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index df3b7f6882..45bba5e6e0 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -1464,6 +1464,7 @@ GLIBC_2.18 pthread_attr_setschedparam F
 GLIBC_2.18 pthread_attr_setschedpolicy F
 GLIBC_2.18 pthread_attr_setscope F
 GLIBC_2.18 pthread_attr_setstack F
+GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_barrier_destroy F
 GLIBC_2.18 pthread_barrier_init F
 GLIBC_2.18 pthread_barrier_wait F
@@ -2317,6 +2318,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/microblaze/le/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
index 3c3109fe29..087a16a383 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.18 __pthread_unregister_cancel_restore F
 GLIBC_2.18 flockfile F
 GLIBC_2.18 ftrylockfile F
 GLIBC_2.18 funlockfile F
-GLIBC_2.18 pthread_attr_setstackaddr F
 GLIBC_2.18 pthread_attr_setstacksize F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index e0b7fa6863..412149f602 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1851,6 +1851,7 @@ GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_init F
 GLIBC_2.2 pthread_attr_setguardsize F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2311,6 +2312,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/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
index 53170cc451..314556c422 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist
@@ -14,7 +14,6 @@ GLIBC_2.12 pthread_getname_np F
 GLIBC_2.12 pthread_setname_np F
 GLIBC_2.18 pthread_getattr_default_np F
 GLIBC_2.18 pthread_setattr_default_np F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_getconcurrency F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 7a786050f8..42e72471ed 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1849,6 +1849,7 @@ GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_init F
 GLIBC_2.2 pthread_attr_setguardsize F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2309,6 +2310,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/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
index 53170cc451..314556c422 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist
@@ -14,7 +14,6 @@ GLIBC_2.12 pthread_getname_np F
 GLIBC_2.12 pthread_setname_np F
 GLIBC_2.18 pthread_getattr_default_np F
 GLIBC_2.18 pthread_setattr_default_np F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_getconcurrency F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index 826095fdb1..ef4d5ac791 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1849,6 +1849,7 @@ GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_init F
 GLIBC_2.2 pthread_attr_setguardsize F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2317,6 +2318,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/mips/mips64/n64/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
index 902b7dca5d..6c54efa839 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1845,6 +1845,7 @@ GLIBC_2.2 pthread_attr_getstacksize F
 GLIBC_2.2 pthread_attr_init F
 GLIBC_2.2 pthread_attr_setguardsize F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2311,6 +2312,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/nios2/libc.abilist b/sysdeps/unix/sysv/linux/nios2/libc.abilist
index 44103c1c3c..3904ea8cd8 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -1507,6 +1507,7 @@ GLIBC_2.21 pthread_attr_setschedparam F
 GLIBC_2.21 pthread_attr_setschedpolicy F
 GLIBC_2.21 pthread_attr_setscope F
 GLIBC_2.21 pthread_attr_setstack F
+GLIBC_2.21 pthread_attr_setstackaddr F
 GLIBC_2.21 pthread_barrier_destroy F
 GLIBC_2.21 pthread_barrier_init F
 GLIBC_2.21 pthread_barrier_wait F
@@ -2359,6 +2360,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/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
index 30b5f6249b..2571e530d4 100644
--- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.21 __pthread_unregister_cancel_restore F
 GLIBC_2.21 flockfile F
 GLIBC_2.21 ftrylockfile F
 GLIBC_2.21 funlockfile F
-GLIBC_2.21 pthread_attr_setstackaddr F
 GLIBC_2.21 pthread_attr_setstacksize F
 GLIBC_2.21 pthread_cancel F
 GLIBC_2.21 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index 92ef714e97..fe201ffc5e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1587,6 +1587,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
@@ -2374,6 +2375,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/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index 11719af380..ba18176b64 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join 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/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 28ba87e8f0..5f55014f9d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1587,6 +1587,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
@@ -2407,6 +2408,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/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index 897afd478f..d4c905a3be 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -1411,6 +1411,7 @@ GLIBC_2.3 pthread_attr_setschedparam F
 GLIBC_2.3 pthread_attr_setschedpolicy F
 GLIBC_2.3 pthread_attr_setscope F
 GLIBC_2.3 pthread_attr_setstack F
+GLIBC_2.3 pthread_attr_setstackaddr F
 GLIBC_2.3 pthread_barrier_destroy F
 GLIBC_2.3 pthread_barrier_init F
 GLIBC_2.3 pthread_barrier_wait F
@@ -2222,6 +2223,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/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index dfb0e601e8..d149687024 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
@@ -13,7 +13,6 @@ GLIBC_2.3 __errno_location F
 GLIBC_2.3 flockfile F
 GLIBC_2.3 ftrylockfile F
 GLIBC_2.3 funlockfile F
-GLIBC_2.3 pthread_attr_setstackaddr F
 GLIBC_2.3 pthread_attr_setstacksize F
 GLIBC_2.3 pthread_cancel F
 GLIBC_2.3 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index a10b2c6cab..6803d4d867 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -1550,6 +1550,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
@@ -2522,6 +2523,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/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
index d052ecdf93..e68d5478b9 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.17 __pthread_unregister_cancel_restore F
 GLIBC_2.17 flockfile F
 GLIBC_2.17 ftrylockfile F
 GLIBC_2.17 funlockfile 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/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index d9318d351f..3563e4c1fc 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -1403,6 +1403,7 @@ GLIBC_2.33 pthread_attr_setschedpolicy F
 GLIBC_2.33 pthread_attr_setscope F
 GLIBC_2.33 pthread_attr_setsigmask_np F
 GLIBC_2.33 pthread_attr_setstack F
+GLIBC_2.33 pthread_attr_setstackaddr F
 GLIBC_2.33 pthread_barrier_destroy F
 GLIBC_2.33 pthread_barrier_init F
 GLIBC_2.33 pthread_barrier_wait F
@@ -2087,6 +2088,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/riscv/rv32/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
index e604f45eb7..eccad93415 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.33 __pthread_unregister_cancel_restore F
 GLIBC_2.33 flockfile F
 GLIBC_2.33 ftrylockfile F
 GLIBC_2.33 funlockfile F
-GLIBC_2.33 pthread_attr_setstackaddr F
 GLIBC_2.33 pthread_attr_setstacksize F
 GLIBC_2.33 pthread_cancel F
 GLIBC_2.33 pthread_clockjoin_np F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index abecab4dec..c02865ca69 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -1452,6 +1452,7 @@ GLIBC_2.27 pthread_attr_setschedparam F
 GLIBC_2.27 pthread_attr_setschedpolicy F
 GLIBC_2.27 pthread_attr_setscope F
 GLIBC_2.27 pthread_attr_setstack F
+GLIBC_2.27 pthread_attr_setstackaddr F
 GLIBC_2.27 pthread_barrier_destroy F
 GLIBC_2.27 pthread_barrier_init F
 GLIBC_2.27 pthread_barrier_wait F
@@ -2287,6 +2288,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/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
index 524b905f46..d6b96f60af 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.27 __pthread_unregister_cancel_restore F
 GLIBC_2.27 flockfile F
 GLIBC_2.27 ftrylockfile F
 GLIBC_2.27 funlockfile F
-GLIBC_2.27 pthread_attr_setstackaddr F
 GLIBC_2.27 pthread_attr_setstacksize F
 GLIBC_2.27 pthread_cancel F
 GLIBC_2.27 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index 561463aff3..e29ef239d0 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -1579,6 +1579,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
@@ -2372,6 +2373,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/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
index 3445cfe9c3..8520c29fbe 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join 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/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index f6c1cc12c7..6a65d9237e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -1306,6 +1306,7 @@ GLIBC_2.2 pthread_attr_setschedparam F
 GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2259,6 +2260,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/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
index 6820ebb90e..18dfb8123b 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist
@@ -11,7 +11,6 @@ GLIBC_2.2 __errno_location F
 GLIBC_2.2 flockfile F
 GLIBC_2.2 ftrylockfile F
 GLIBC_2.2 funlockfile F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 3d656b228c..0f57ddf8fa 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -1292,6 +1292,7 @@ GLIBC_2.2 pthread_attr_setschedparam F
 GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2228,6 +2229,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/sh/be/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
index c4da8bd75e..96eae4e266 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libpthread.abilist
@@ -10,7 +10,6 @@ GLIBC_2.2 __errno_location F
 GLIBC_2.2 flockfile F
 GLIBC_2.2 ftrylockfile F
 GLIBC_2.2 funlockfile F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 38b9235fa3..91e84940c7 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -1292,6 +1292,7 @@ GLIBC_2.2 pthread_attr_setschedparam F
 GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2225,6 +2226,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/sh/le/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
index c4da8bd75e..96eae4e266 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libpthread.abilist
@@ -10,7 +10,6 @@ GLIBC_2.2 __errno_location F
 GLIBC_2.2 flockfile F
 GLIBC_2.2 ftrylockfile F
 GLIBC_2.2 funlockfile F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index f13133c552..b3b4922658 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1580,6 +1580,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
@@ -2364,6 +2365,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/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
index b48d5eece8..bc250db1a7 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.0 pthread_cancel F
 GLIBC_2.0 pthread_create F
 GLIBC_2.0 pthread_detach F
 GLIBC_2.0 pthread_join 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/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index 8773e3173d..a0ca58b604 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -1335,6 +1335,7 @@ GLIBC_2.2 pthread_attr_setschedparam F
 GLIBC_2.2 pthread_attr_setschedpolicy F
 GLIBC_2.2 pthread_attr_setscope F
 GLIBC_2.2 pthread_attr_setstack F
+GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2277,6 +2278,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/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
index 453d496ff4..b651032192 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist
@@ -10,7 +10,6 @@ GLIBC_2.2 __errno_location F
 GLIBC_2.2 flockfile F
 GLIBC_2.2 ftrylockfile F
 GLIBC_2.2 funlockfile F
-GLIBC_2.2 pthread_attr_setstackaddr F
 GLIBC_2.2 pthread_attr_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index 1ce82295fe..a301f95416 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -1302,6 +1302,7 @@ GLIBC_2.2.5 pthread_attr_setschedparam F
 GLIBC_2.2.5 pthread_attr_setschedpolicy F
 GLIBC_2.2.5 pthread_attr_setscope F
 GLIBC_2.2.5 pthread_attr_setstack F
+GLIBC_2.2.5 pthread_attr_setstackaddr F
 GLIBC_2.2.5 pthread_barrier_destroy F
 GLIBC_2.2.5 pthread_barrier_init F
 GLIBC_2.2.5 pthread_barrier_wait F
@@ -2237,6 +2238,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/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
index de20236bdc..90654914e4 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist
@@ -10,7 +10,6 @@ GLIBC_2.2.5 __errno_location F
 GLIBC_2.2.5 flockfile F
 GLIBC_2.2.5 ftrylockfile F
 GLIBC_2.2.5 funlockfile F
-GLIBC_2.2.5 pthread_attr_setstackaddr F
 GLIBC_2.2.5 pthread_attr_setstacksize F
 GLIBC_2.2.5 pthread_cancel F
 GLIBC_2.2.5 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index 219fdccc1a..e0da7d94ed 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -1469,6 +1469,7 @@ GLIBC_2.16 pthread_attr_setschedparam F
 GLIBC_2.16 pthread_attr_setschedpolicy F
 GLIBC_2.16 pthread_attr_setscope F
 GLIBC_2.16 pthread_attr_setstack F
+GLIBC_2.16 pthread_attr_setstackaddr F
 GLIBC_2.16 pthread_barrier_destroy F
 GLIBC_2.16 pthread_barrier_init F
 GLIBC_2.16 pthread_barrier_wait F
@@ -2341,6 +2342,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/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
index 03069c7bc1..84420edc5d 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist
@@ -9,7 +9,6 @@ GLIBC_2.16 __pthread_unregister_cancel_restore F
 GLIBC_2.16 flockfile F
 GLIBC_2.16 ftrylockfile F
 GLIBC_2.16 funlockfile F
-GLIBC_2.16 pthread_attr_setstackaddr F
 GLIBC_2.16 pthread_attr_setstacksize F
 GLIBC_2.16 pthread_cancel F
 GLIBC_2.16 pthread_create F
