diff --git a/htl/Makefile b/htl/Makefile
index a4d900d5ff..1340c1b688 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -26,7 +26,6 @@ LCLHDRS :=
 
 libpthread-routines := \
   pt-attr-getstack \
-  pt-attr-getstackaddr \
   pt-attr-init \
   pt-attr-setguardsize \
   pt-attr-setschedparam \
@@ -202,6 +201,7 @@ routines := \
   pt-attr-getschedparam \
   pt-attr-getschedpolicy \
   pt-attr-getscope \
+  pt-attr-getstackaddr \
   pt-attr-getstacksize \
   pt-attr-setdetachstate \
   pt-attr-setinheritsched \
diff --git a/htl/Versions b/htl/Versions
index deca0d4109..f72569c63d 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -17,6 +17,7 @@ libc {
     pthread_attr_getguardsize;
     pthread_attr_getscope;
     pthread_attr_getstacksize;
+    pthread_attr_getstackaddr;
   }
 
   GLIBC_2.21 {
@@ -49,6 +50,7 @@ libc {
   GLIBC_2.41 {
     pthread_attr_getguardsize;
     pthread_attr_getstacksize;
+    pthread_attr_getstackaddr;
   }
 
 
@@ -61,6 +63,7 @@ libc {
     __pthread_init_thread;
     __pthread_default_attr;
     __pthread_attr_getstacksize;
+    __pthread_attr_getstackaddr;
   }
 }
 
@@ -89,7 +92,7 @@ libpthread {
 
     pthread_atfork;
 
-    pthread_attr_getstack; pthread_attr_getstackaddr;
+    pthread_attr_getstack;
     pthread_attr_init;
     pthread_attr_setguardsize;
     pthread_attr_setschedparam;
diff --git a/sysdeps/htl/pt-attr-getstackaddr.c b/sysdeps/htl/pt-attr-getstackaddr.c
index 2782ee3b85..86f5e8d14a 100644
--- a/sysdeps/htl/pt-attr-getstackaddr.c
+++ b/sysdeps/htl/pt-attr-getstackaddr.c
@@ -17,6 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 int
@@ -25,4 +26,9 @@ __pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
   *stackaddr = attr->__stackaddr;
   return 0;
 }
-weak_alias (__pthread_attr_getstackaddr, pthread_attr_getstackaddr)
+libc_hidden_def (__pthread_attr_getstackaddr)
+versioned_symbol (libc, __pthread_attr_getstackaddr, pthread_attr_getstackaddr, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_attr_getstackaddr,pthread_attr_getstackaddr, GLIBC_2_12);
+#endif
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 9aef867708..a397112f52 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -83,6 +83,7 @@ int __pthread_setcancelstate (int state, int *oldstate);
 int __pthread_getattr_np (pthread_t, pthread_attr_t *);
 int __pthread_attr_getstackaddr (const pthread_attr_t *__restrict __attr,
 				 void **__restrict __stackaddr);
+libc_hidden_proto (__pthread_attr_getstackaddr)
 int __pthread_attr_setstackaddr (pthread_attr_t *__attr, void *__stackaddr);
 int __pthread_attr_getstacksize (const pthread_attr_t *__restrict __attr,
 				 size_t *__restrict __stacksize);
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index cb577ababf..d93a0f403b 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -36,6 +36,7 @@ GLIBC_2.12 pthread_attr_getinheritsched F
 GLIBC_2.12 pthread_attr_getschedparam F
 GLIBC_2.12 pthread_attr_getschedpolicy F
 GLIBC_2.12 pthread_attr_getscope F
+GLIBC_2.12 pthread_attr_getstackaddr F
 GLIBC_2.12 pthread_attr_getstacksize F
 GLIBC_2.12 pthread_attr_setdetachstate F
 GLIBC_2.12 pthread_attr_setinheritsched F
@@ -2487,6 +2488,7 @@ GLIBC_2.4 renameat F
 GLIBC_2.4 symlinkat F
 GLIBC_2.4 unlinkat F
 GLIBC_2.41 pthread_attr_getguardsize F
+GLIBC_2.41 pthread_attr_getstackaddr F
 GLIBC_2.41 pthread_attr_getstacksize F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 8d700ff448..fed162643b 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -23,7 +23,6 @@ GLIBC_2.12 ftrylockfile F
 GLIBC_2.12 funlockfile F
 GLIBC_2.12 pthread_atfork F
 GLIBC_2.12 pthread_attr_getstack F
-GLIBC_2.12 pthread_attr_getstackaddr F
 GLIBC_2.12 pthread_attr_init F
 GLIBC_2.12 pthread_attr_setguardsize F
 GLIBC_2.12 pthread_attr_setschedparam F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index c0bf7367c6..242c40e81e 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1518,6 +1518,7 @@ GLIBC_2.38 pthread_attr_getinheritsched F
 GLIBC_2.38 pthread_attr_getschedparam F
 GLIBC_2.38 pthread_attr_getschedpolicy F
 GLIBC_2.38 pthread_attr_getscope F
+GLIBC_2.38 pthread_attr_getstackaddr F
 GLIBC_2.38 pthread_attr_getstacksize F
 GLIBC_2.38 pthread_attr_init F
 GLIBC_2.38 pthread_attr_setdetachstate F
@@ -2187,6 +2188,7 @@ GLIBC_2.39 stdc_trailing_zeros_ul F
 GLIBC_2.39 stdc_trailing_zeros_ull F
 GLIBC_2.39 stdc_trailing_zeros_us F
 GLIBC_2.41 pthread_attr_getguardsize F
+GLIBC_2.41 pthread_attr_getstackaddr F
 GLIBC_2.41 pthread_attr_getstacksize F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index c0bfe11d03..a1f74eb9f0 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -40,7 +40,6 @@ GLIBC_2.38 mtx_timedlock F
 GLIBC_2.38 mtx_trylock F
 GLIBC_2.38 mtx_unlock F
 GLIBC_2.38 pthread_attr_getstack F
-GLIBC_2.38 pthread_attr_getstackaddr F
 GLIBC_2.38 pthread_attr_init F
 GLIBC_2.38 pthread_attr_setguardsize F
 GLIBC_2.38 pthread_attr_setschedparam F