diff --git a/nptl/Makefile b/nptl/Makefile
index ef19ef6019..7f50e0640b 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -81,6 +81,7 @@ routines = \
   pthread_attr_setsigmask_internal \
   pthread_attr_setstack \
   pthread_attr_setstackaddr \
+  pthread_attr_setstacksize \
   pthread_barrier_destroy \
   pthread_barrier_init \
   pthread_barrier_wait \
@@ -194,7 +195,6 @@ libpthread-routines = \
   nptl-init \
   nptlfreeres \
   pt-interp \
-  pthread_attr_setstacksize \
   pthread_cancel \
   pthread_clockjoin \
   pthread_create \
diff --git a/nptl/Versions b/nptl/Versions
index c21838991d..dd67f4a558 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -76,6 +76,7 @@ libc {
     pthread_attr_init;
     pthread_attr_setguardsize;
     pthread_attr_setstackaddr;
+    pthread_attr_setstacksize;
     pthread_mutexattr_gettype;
     pthread_mutexattr_settype;
     pthread_rwlock_destroy;
@@ -242,6 +243,7 @@ libc {
     pthread_attr_setguardsize;
     pthread_attr_setstack;
     pthread_attr_setstackaddr;
+    pthread_attr_setstacksize;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -380,7 +382,6 @@ libpthread {
   }
 
   GLIBC_2.1 {
-    pthread_attr_setstacksize;
     pthread_create;
     pthread_getconcurrency;
     pthread_setconcurrency;
diff --git a/nptl/pthread_attr_setstacksize.c b/nptl/pthread_attr_setstacksize.c
index 1433cecf94..2dbd981c7f 100644
--- a/nptl/pthread_attr_setstacksize.c
+++ b/nptl/pthread_attr_setstacksize.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <limits.h>
 #include "pthreadP.h"
+#include <shlib-compat.h>
 
 #ifndef NEW_VERNUM
 # define NEW_VERNUM GLIBC_2_3_3
@@ -41,15 +42,22 @@ __pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
 
   return 0;
 }
+versioned_symbol (libc, __pthread_attr_setstacksize,
+		  pthread_attr_setstacksize, GLIBC_2_34);
+
 
 #if PTHREAD_STACK_MIN == 16384
-strong_alias (__pthread_attr_setstacksize, pthread_attr_setstacksize)
-#else
-# include <shlib-compat.h>
-versioned_symbol (libpthread, __pthread_attr_setstacksize,
-		  pthread_attr_setstacksize, NEW_VERNUM);
+# if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_setstacksize,
+	       pthread_attr_setstacksize, GLIBC_2_1);
+# endif
+#else /* PTHREAD_STACK_MIN != 16384 */
+# if OTHER_SHLIB_COMPAT (libpthread, NEW_VERNUM, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_setstacksize,
+	       pthread_attr_setstacksize, NEW_VERNUM);
+# endif
 
-# if SHLIB_COMPAT(libpthread, GLIBC_2_1, NEW_VERNUM)
+# if OTHER_SHLIB_COMPAT(libpthread, GLIBC_2_1, NEW_VERNUM)
 
 int
 __old_pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
@@ -73,6 +81,5 @@ __old_pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
 
 compat_symbol (libpthread, __old_pthread_attr_setstacksize,
 	       pthread_attr_setstacksize, GLIBC_2_1);
-# endif
-
-#endif
+# endif /* OTHER_SHLIB_COMPAT */
+#endif /* PTHREAD_STACK_MIN != 16384 */
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index e5f9e8be30..1f05a7c9d5 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1463,6 +1463,7 @@ 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_attr_setstacksize F
 GLIBC_2.17 pthread_barrier_destroy F
 GLIBC_2.17 pthread_barrier_init F
 GLIBC_2.17 pthread_barrier_wait F
@@ -2328,6 +2329,7 @@ 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_attr_setstacksize 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 e68d5478b9..1bddcdabbe 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_setstacksize F
 GLIBC_2.17 pthread_cancel F
 GLIBC_2.17 pthread_create F
 GLIBC_2.17 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index aa8f517a17..31fa763b5c 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1616,6 +1616,7 @@ 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_attr_setstacksize F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2286,6 +2287,7 @@ GLIBC_2.3.3 nftw64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2417,6 +2419,7 @@ 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_attr_setstacksize 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 bc250db1a7..db73cabda0 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_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
@@ -31,7 +30,6 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 0b0f3e9cde..5547b27939 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1402,6 +1402,7 @@ 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_attr_setstacksize F
 GLIBC_2.32 pthread_barrier_destroy F
 GLIBC_2.32 pthread_barrier_init F
 GLIBC_2.32 pthread_barrier_wait F
@@ -2087,6 +2088,7 @@ 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_attr_setstacksize 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 b36a6d141d..24835a0f77 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_setstacksize F
 GLIBC_2.32 pthread_cancel F
 GLIBC_2.32 pthread_clockjoin_np F
 GLIBC_2.32 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
index c90d4addc0..00bccf9ece 100644
--- a/sysdeps/unix/sysv/linux/arm/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/be/libc.abilist
@@ -209,6 +209,7 @@ 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_attr_setstacksize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
@@ -1683,6 +1684,7 @@ 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_attr_setstacksize 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 c16aa7efe8..d28748af01 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_setstacksize F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_create F
 GLIBC_2.4 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/arm/le/libc.abilist b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
index a322949e5d..8e16be6200 100644
--- a/sysdeps/unix/sysv/linux/arm/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arm/le/libc.abilist
@@ -206,6 +206,7 @@ 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_attr_setstacksize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
@@ -1680,6 +1681,7 @@ 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_attr_setstacksize 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 c16aa7efe8..d28748af01 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_setstacksize F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_create F
 GLIBC_2.4 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/csky/libc.abilist b/sysdeps/unix/sysv/linux/csky/libc.abilist
index ce958b3b6a..c788e382e5 100644
--- a/sysdeps/unix/sysv/linux/csky/libc.abilist
+++ b/sysdeps/unix/sysv/linux/csky/libc.abilist
@@ -1463,6 +1463,7 @@ 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_attr_setstacksize F
 GLIBC_2.29 pthread_barrier_destroy F
 GLIBC_2.29 pthread_barrier_init F
 GLIBC_2.29 pthread_barrier_wait F
@@ -2271,6 +2272,7 @@ 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_attr_setstacksize 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 010d6a21f4..fc5d1efae3 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_setstacksize F
 GLIBC_2.29 pthread_cancel F
 GLIBC_2.29 pthread_create F
 GLIBC_2.29 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/hppa/libc.abilist b/sysdeps/unix/sysv/linux/hppa/libc.abilist
index 474e765586..2f3fb02abb 100644
--- a/sysdeps/unix/sysv/linux/hppa/libc.abilist
+++ b/sysdeps/unix/sysv/linux/hppa/libc.abilist
@@ -1289,6 +1289,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2223,6 +2224,7 @@ 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_attr_setstacksize 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 96eae4e266..295db6b292 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_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist
index b952ed800a..68ed60cf92 100644
--- a/sysdeps/unix/sysv/linux/i386/libc.abilist
+++ b/sysdeps/unix/sysv/linux/i386/libc.abilist
@@ -1584,6 +1584,7 @@ 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_attr_setstacksize F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2406,6 +2407,7 @@ 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_attr_setstacksize 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 0c565f95a8..db73cabda0 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_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist
index c10f16bd1a..3e598c7b10 100644
--- a/sysdeps/unix/sysv/linux/ia64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist
@@ -1310,6 +1310,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2154,6 +2155,7 @@ GLIBC_2.3.3 nftw64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2258,6 +2260,7 @@ 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_attr_setstacksize 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 b651032192..295db6b292 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_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
@@ -28,7 +27,6 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
index b9159fa39b..592c1f192c 100644
--- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
@@ -210,6 +210,7 @@ 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_attr_setstacksize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
@@ -1663,6 +1664,7 @@ 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_attr_setstacksize 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 c16aa7efe8..d28748af01 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_setstacksize F
 GLIBC_2.4 pthread_cancel F
 GLIBC_2.4 pthread_create F
 GLIBC_2.4 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
index c5f0f07dc4..0d865c049d 100644
--- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
+++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
@@ -1580,6 +1580,7 @@ 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_attr_setstacksize F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2349,6 +2350,7 @@ 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_attr_setstacksize 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 0c565f95a8..db73cabda0 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_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
diff --git a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
index 3390306d84..7dc815ec4d 100644
--- a/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/be/libc.abilist
@@ -1465,6 +1465,7 @@ 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_attr_setstacksize F
 GLIBC_2.18 pthread_barrier_destroy F
 GLIBC_2.18 pthread_barrier_init F
 GLIBC_2.18 pthread_barrier_wait F
@@ -2322,6 +2323,7 @@ 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_attr_setstacksize 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 087a16a383..d6220e467b 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_setstacksize F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_create F
 GLIBC_2.18 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
index 45bba5e6e0..4e9b3d42e0 100644
--- a/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/microblaze/le/libc.abilist
@@ -1465,6 +1465,7 @@ 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_attr_setstacksize F
 GLIBC_2.18 pthread_barrier_destroy F
 GLIBC_2.18 pthread_barrier_init F
 GLIBC_2.18 pthread_barrier_wait F
@@ -2319,6 +2320,7 @@ 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_attr_setstacksize 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 087a16a383..d6220e467b 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_setstacksize F
 GLIBC_2.18 pthread_cancel F
 GLIBC_2.18 pthread_create F
 GLIBC_2.18 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
index 412149f602..89981a3ec3 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
@@ -1852,6 +1852,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2212,6 +2213,7 @@ GLIBC_2.3.3 posix_fallocate64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2313,6 +2315,7 @@ 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_attr_setstacksize 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 314556c422..a7bf445d50 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_setstacksize F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
@@ -29,7 +28,6 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
index 42e72471ed..0f8e32e328 100644
--- a/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
@@ -1850,6 +1850,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2210,6 +2211,7 @@ GLIBC_2.3.3 posix_fallocate64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2311,6 +2313,7 @@ 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_attr_setstacksize 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 314556c422..a7bf445d50 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_setstacksize F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_getconcurrency F
 GLIBC_2.2 pthread_getcpuclockid F
@@ -29,7 +28,6 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
index ef4d5ac791..ba10f06035 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
@@ -1850,6 +1850,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2218,6 +2219,7 @@ GLIBC_2.3.3 posix_fallocate64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2319,6 +2321,7 @@ 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_attr_setstacksize 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 6c54efa839..8d0d4058a6 100644
--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
@@ -1846,6 +1846,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2210,6 +2211,7 @@ GLIBC_2.3.3 posix_fadvise64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2313,6 +2315,7 @@ 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_attr_setstacksize 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 3904ea8cd8..7ada08c5a1 100644
--- a/sysdeps/unix/sysv/linux/nios2/libc.abilist
+++ b/sysdeps/unix/sysv/linux/nios2/libc.abilist
@@ -1508,6 +1508,7 @@ 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_attr_setstacksize F
 GLIBC_2.21 pthread_barrier_destroy F
 GLIBC_2.21 pthread_barrier_init F
 GLIBC_2.21 pthread_barrier_wait F
@@ -2361,6 +2362,7 @@ 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_attr_setstacksize 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 2571e530d4..469db73fb9 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_setstacksize F
 GLIBC_2.21 pthread_cancel F
 GLIBC_2.21 pthread_create F
 GLIBC_2.21 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/powerpc/Versions b/sysdeps/unix/sysv/linux/powerpc/Versions
index 8ebeea15a1..cc28d84744 100644
--- a/sysdeps/unix/sysv/linux/powerpc/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/Versions
@@ -17,3 +17,8 @@ libm {
   GLIBC_2.19 {
   }
 }
+libpthread {
+  GLIBC_2.6 {
+    __libpthread_version_placeholder;
+  }
+}
\ No newline at end of file
diff --git a/sysdeps/unix/sysv/linux/powerpc/libpthread-compat.c b/sysdeps/unix/sysv/linux/powerpc/libpthread-compat.c
new file mode 100644
index 0000000000..ea5482c842
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/libpthread-compat.c
@@ -0,0 +1,24 @@
+/* Placeholder definitions for removed symbol versions.  powerpc version.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <nptl/libpthread-compat.c>
+
+#if SHLIB_COMPAT (libpthread, GLIBC_2_6, GLIBC_2_7)
+compat_symbol (libpthread, __libpthread_version_placeholder_1,
+               __libpthread_version_placeholder, GLIBC_2_6);
+#endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
index e13d20b93b..ee505efb9e 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Versions
@@ -39,8 +39,4 @@ libpthread {
   GLIBC_2.3.4 {
     longjmp; siglongjmp;
   }
-  GLIBC_2.6 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
 }
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
index fe201ffc5e..158a10a01f 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
@@ -1588,6 +1588,7 @@ 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_attr_setstacksize F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2376,6 +2377,7 @@ 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_attr_setstacksize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
@@ -2708,6 +2710,7 @@ GLIBC_2.6 __sched_cpucount F
 GLIBC_2.6 epoll_pwait F
 GLIBC_2.6 futimens F
 GLIBC_2.6 pthread_attr_setstack F
+GLIBC_2.6 pthread_attr_setstacksize F
 GLIBC_2.6 sched_getcpu F
 GLIBC_2.6 strerror_l F
 GLIBC_2.6 sync_file_range F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist
index ba18176b64..6220a80b07 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_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
@@ -39,4 +38,4 @@ GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 pthread_clockjoin_np F
 GLIBC_2.4 __libpthread_version_placeholder F
-GLIBC_2.6 pthread_attr_setstacksize F
+GLIBC_2.6 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
index 5f55014f9d..914b8a8aaa 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
@@ -1588,6 +1588,7 @@ 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_attr_setstacksize F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2409,6 +2410,7 @@ 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_attr_setstacksize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
@@ -2753,6 +2755,7 @@ GLIBC_2.6 __sched_cpucount F
 GLIBC_2.6 epoll_pwait F
 GLIBC_2.6 futimens F
 GLIBC_2.6 pthread_attr_setstack F
+GLIBC_2.6 pthread_attr_setstacksize F
 GLIBC_2.6 sched_getcpu F
 GLIBC_2.6 strerror_l F
 GLIBC_2.6 sync_file_range F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
index a8e88b89db..7a166f2400 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
@@ -36,8 +36,4 @@ libpthread {
   GLIBC_2.3.4 {
     longjmp; siglongjmp;
   }
-  GLIBC_2.6 {
-    # Changed PTHREAD_STACK_MIN.
-    pthread_attr_setstack; pthread_attr_setstacksize;
-  }
 }
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
index d4c905a3be..e51584c37b 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist
@@ -1412,6 +1412,7 @@ 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_attr_setstacksize F
 GLIBC_2.3 pthread_barrier_destroy F
 GLIBC_2.3 pthread_barrier_init F
 GLIBC_2.3 pthread_barrier_wait F
@@ -2224,6 +2225,7 @@ 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_attr_setstacksize F
 GLIBC_2.34 pthread_barrier_destroy F
 GLIBC_2.34 pthread_barrier_init F
 GLIBC_2.34 pthread_barrier_wait F
@@ -2556,6 +2558,7 @@ GLIBC_2.6 __sched_cpucount F
 GLIBC_2.6 epoll_pwait F
 GLIBC_2.6 futimens F
 GLIBC_2.6 pthread_attr_setstack F
+GLIBC_2.6 pthread_attr_setstacksize F
 GLIBC_2.6 sched_getcpu F
 GLIBC_2.6 strerror_l F
 GLIBC_2.6 sync_file_range F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist
index d149687024..ba291565d7 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_setstacksize F
 GLIBC_2.3 pthread_cancel F
 GLIBC_2.3 pthread_create F
 GLIBC_2.3 pthread_detach F
@@ -34,4 +33,4 @@ GLIBC_2.3.4 pthread_setschedprio F
 GLIBC_2.30 __libpthread_version_placeholder F
 GLIBC_2.31 pthread_clockjoin_np F
 GLIBC_2.4 __libpthread_version_placeholder F
-GLIBC_2.6 pthread_attr_setstacksize F
+GLIBC_2.6 __libpthread_version_placeholder F
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
index 6803d4d867..601ce5ce5d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist
@@ -1551,6 +1551,7 @@ 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_attr_setstacksize F
 GLIBC_2.17 pthread_barrier_destroy F
 GLIBC_2.17 pthread_barrier_init F
 GLIBC_2.17 pthread_barrier_wait F
@@ -2524,6 +2525,7 @@ 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_attr_setstacksize 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 e68d5478b9..1bddcdabbe 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_setstacksize F
 GLIBC_2.17 pthread_cancel F
 GLIBC_2.17 pthread_create F
 GLIBC_2.17 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
index 3563e4c1fc..f304214654 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
@@ -1404,6 +1404,7 @@ 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_attr_setstacksize F
 GLIBC_2.33 pthread_barrier_destroy F
 GLIBC_2.33 pthread_barrier_init F
 GLIBC_2.33 pthread_barrier_wait F
@@ -2089,6 +2090,7 @@ 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_attr_setstacksize 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 eccad93415..8e5c33dada 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_setstacksize F
 GLIBC_2.33 pthread_cancel F
 GLIBC_2.33 pthread_clockjoin_np F
 GLIBC_2.33 pthread_create F
diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
index c02865ca69..91475436fa 100644
--- a/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist
@@ -1453,6 +1453,7 @@ 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_attr_setstacksize F
 GLIBC_2.27 pthread_barrier_destroy F
 GLIBC_2.27 pthread_barrier_init F
 GLIBC_2.27 pthread_barrier_wait F
@@ -2289,6 +2290,7 @@ 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_attr_setstacksize 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 d6b96f60af..05cc361cf6 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_setstacksize F
 GLIBC_2.27 pthread_cancel F
 GLIBC_2.27 pthread_create F
 GLIBC_2.27 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
index e29ef239d0..36372f2a39 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
@@ -1580,6 +1580,7 @@ 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_attr_setstacksize 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_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_attr_setstacksize 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 8520c29fbe..8a96997d46 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_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
index 6a65d9237e..77163bb89e 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
@@ -1307,6 +1307,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2261,6 +2262,7 @@ 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_attr_setstacksize 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 18dfb8123b..947cb6a546 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_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sh/be/libc.abilist b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
index 0f57ddf8fa..cec69afe9c 100644
--- a/sysdeps/unix/sysv/linux/sh/be/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/be/libc.abilist
@@ -1293,6 +1293,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2230,6 +2231,7 @@ 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_attr_setstacksize 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 96eae4e266..295db6b292 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_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sh/le/libc.abilist b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
index 91e84940c7..a436181878 100644
--- a/sysdeps/unix/sysv/linux/sh/le/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sh/le/libc.abilist
@@ -1293,6 +1293,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2227,6 +2228,7 @@ 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_attr_setstacksize 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 96eae4e266..295db6b292 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_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
index b3b4922658..85c9c41885 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
@@ -1581,6 +1581,7 @@ 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_attr_setstacksize F
 GLIBC_2.1 pthread_mutexattr_gettype F
 GLIBC_2.1 pthread_mutexattr_settype F
 GLIBC_2.1 pthread_rwlock_destroy F
@@ -2253,6 +2254,7 @@ GLIBC_2.3.3 posix_fallocate64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2366,6 +2368,7 @@ 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_attr_setstacksize 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 bc250db1a7..db73cabda0 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_setstacksize F
 GLIBC_2.1 pthread_create F
 GLIBC_2.1 pthread_getconcurrency F
 GLIBC_2.1 pthread_setconcurrency F
@@ -31,7 +30,6 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
index a0ca58b604..0dcb551e29 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
@@ -1336,6 +1336,7 @@ 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_attr_setstacksize F
 GLIBC_2.2 pthread_barrier_destroy F
 GLIBC_2.2 pthread_barrier_init F
 GLIBC_2.2 pthread_barrier_wait F
@@ -2176,6 +2177,7 @@ GLIBC_2.3.3 nftw64 F
 GLIBC_2.3.3 pthread_attr_getaffinity_np F
 GLIBC_2.3.3 pthread_attr_setaffinity_np F
 GLIBC_2.3.3 pthread_attr_setstack F
+GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_barrierattr_getpshared F
 GLIBC_2.3.3 pthread_condattr_getclock F
 GLIBC_2.3.3 pthread_condattr_setclock F
@@ -2279,6 +2281,7 @@ 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_attr_setstacksize 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 b651032192..295db6b292 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_setstacksize F
 GLIBC_2.2 pthread_cancel F
 GLIBC_2.2 pthread_create F
 GLIBC_2.2 pthread_detach F
@@ -28,7 +27,6 @@ GLIBC_2.3.3 __pthread_register_cancel F
 GLIBC_2.3.3 __pthread_register_cancel_defer F
 GLIBC_2.3.3 __pthread_unregister_cancel F
 GLIBC_2.3.3 __pthread_unregister_cancel_restore F
-GLIBC_2.3.3 pthread_attr_setstacksize F
 GLIBC_2.3.3 pthread_setaffinity_np F
 GLIBC_2.3.3 pthread_timedjoin_np F
 GLIBC_2.3.3 pthread_tryjoin_np F
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
index a301f95416..bb45f62503 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
@@ -1303,6 +1303,7 @@ 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_attr_setstacksize 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
@@ -2239,6 +2240,7 @@ 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_attr_setstacksize 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 90654914e4..900869dbbb 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_setstacksize F
 GLIBC_2.2.5 pthread_cancel F
 GLIBC_2.2.5 pthread_create F
 GLIBC_2.2.5 pthread_detach F
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
index e0da7d94ed..c2a78207f6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist
@@ -1470,6 +1470,7 @@ 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_attr_setstacksize F
 GLIBC_2.16 pthread_barrier_destroy F
 GLIBC_2.16 pthread_barrier_init F
 GLIBC_2.16 pthread_barrier_wait F
@@ -2343,6 +2344,7 @@ 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_attr_setstacksize 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 84420edc5d..337e92b014 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_setstacksize F
 GLIBC_2.16 pthread_cancel F
 GLIBC_2.16 pthread_create F
 GLIBC_2.16 pthread_detach F
