[hurd,commited 05/13] htl move pthread_attr_getstacksize into libc.

[Samuel Thibault]

From: gfleury <gfleury@disroot.org>

Signed-off-by: gfleury <gfleury@disroot.org>
---
 htl/Makefile                                | 2 +-
 htl/Versions                                | 5 ++++-
 sysdeps/htl/pt-attr-getstacksize.c          | 8 +++++++-
 sysdeps/htl/pthreadP.h                      | 1 +
 sysdeps/mach/hurd/i386/libc.abilist         | 2 ++
 sysdeps/mach/hurd/i386/libpthread.abilist   | 1 -
 sysdeps/mach/hurd/x86_64/libc.abilist       | 2 ++
 sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 -
 8 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index d8a5757d0b..a4d900d5ff 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -27,7 +27,6 @@ LCLHDRS :=
 libpthread-routines := \
   pt-attr-getstack \
   pt-attr-getstackaddr \
-  pt-attr-getstacksize \
   pt-attr-init \
   pt-attr-setguardsize \
   pt-attr-setschedparam \
@@ -203,6 +202,7 @@ routines := \
   pt-attr-getschedparam \
   pt-attr-getschedpolicy \
   pt-attr-getscope \
+  pt-attr-getstacksize \
   pt-attr-setdetachstate \
   pt-attr-setinheritsched \
   pt-attr-setschedpolicy \
diff --git a/htl/Versions b/htl/Versions
index 4372c2de8f..deca0d4109 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -16,6 +16,7 @@ libc {
     pthread_attr_destroy;
     pthread_attr_getguardsize;
     pthread_attr_getscope;
+    pthread_attr_getstacksize;
   }
 
   GLIBC_2.21 {
@@ -47,6 +48,7 @@ libc {
 
   GLIBC_2.41 {
     pthread_attr_getguardsize;
+    pthread_attr_getstacksize;
   }
 
 
@@ -58,6 +60,7 @@ libc {
     ___pthread_self;
     __pthread_init_thread;
     __pthread_default_attr;
+    __pthread_attr_getstacksize;
   }
 }
 
@@ -87,7 +90,7 @@ libpthread {
     pthread_atfork;
 
     pthread_attr_getstack; pthread_attr_getstackaddr;
-    pthread_attr_getstacksize; pthread_attr_init;
+    pthread_attr_init;
     pthread_attr_setguardsize;
     pthread_attr_setschedparam;
     pthread_attr_setscope; pthread_attr_setstack; pthread_attr_setstackaddr;
diff --git a/sysdeps/htl/pt-attr-getstacksize.c 
b/sysdeps/htl/pt-attr-getstacksize.c
index 1f05fe0d85..45589aa070 100644
--- a/sysdeps/htl/pt-attr-getstacksize.c
+++ b/sysdeps/htl/pt-attr-getstacksize.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_getstacksize (const pthread_attr_t *attr, 
size_t * stacksize)
   *stacksize = attr->__stacksize;
   return 0;
 }
-weak_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize)
+libc_hidden_def (__pthread_attr_getstacksize)
+versioned_symbol (libc, __pthread_attr_getstacksize, 
pthread_attr_getstacksize, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, 
__pthread_attr_getstacksize,pthread_attr_getstacksize, GLIBC_2_12);
+#endif
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index b0c9ceb23a..9aef867708 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -86,6 +86,7 @@ int __pthread_attr_getstackaddr (const pthread_attr_t 
*__restrict __attr,
 int __pthread_attr_setstackaddr (pthread_attr_t *__attr, void *__stackaddr);
 int __pthread_attr_getstacksize (const pthread_attr_t *__restrict __attr,
                                 size_t *__restrict __stacksize);
+libc_hidden_proto (__pthread_attr_getstacksize)
 int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
 int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr,
                             size_t __stacksize);
diff --git a/sysdeps/mach/hurd/i386/libc.abilist 
b/sysdeps/mach/hurd/i386/libc.abilist
index 8dd66f4a64..cb577ababf 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_getstacksize F
 GLIBC_2.12 pthread_attr_setdetachstate F
 GLIBC_2.12 pthread_attr_setinheritsched F
 GLIBC_2.12 pthread_attr_setschedpolicy F
@@ -2486,6 +2487,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_getstacksize F
 GLIBC_2.5 __readlinkat_chk F
 GLIBC_2.5 inet6_opt_append F
 GLIBC_2.5 inet6_opt_find F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist 
b/sysdeps/mach/hurd/i386/libpthread.abilist
index 03fcee4ce6..8d700ff448 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -24,7 +24,6 @@ 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_getstacksize 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 ca72304ddc..c0bf7367c6 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_getstacksize F
 GLIBC_2.38 pthread_attr_init F
 GLIBC_2.38 pthread_attr_setdetachstate F
 GLIBC_2.38 pthread_attr_setinheritsched F
@@ -2186,6 +2187,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_getstacksize F
 HURD_CTHREADS_0.3 __cthread_getspecific F
 HURD_CTHREADS_0.3 __cthread_keycreate F
 HURD_CTHREADS_0.3 __cthread_setspecific F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist 
b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index 1d18972651..c0bfe11d03 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -41,7 +41,6 @@ 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_getstacksize F
 GLIBC_2.38 pthread_attr_init F
 GLIBC_2.38 pthread_attr_setguardsize F
 GLIBC_2.38 pthread_attr_setschedparam F
-- 
2.45.2