about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-05-11 19:32:43 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-05-11 19:33:14 +0200
commitee092efed40d667b313f0d38c91941499a01bf06 (patch)
tree5571ecfe04ec5157da635316f4a2e598ddac0de0 /nptl
parentb5e75df2a5afef1a270a6dbc4a732e830ad212a4 (diff)
downloadglibc-ee092efed40d667b313f0d38c91941499a01bf06.tar.gz
glibc-ee092efed40d667b313f0d38c91941499a01bf06.tar.xz
glibc-ee092efed40d667b313f0d38c91941499a01bf06.zip
nptl: Move pthread_attr_getstacksize into libc
The symbol was moved using scripts/move-symbol-to-libc.py.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile2
-rw-r--r--nptl/Versions3
-rw-r--r--nptl/pthread_attr_getstacksize.c9
3 files changed, 10 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 0844b5203b..e7857720ba 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -71,6 +71,7 @@ routines = \
   pthread_attr_getsigmask \
   pthread_attr_getstack \
   pthread_attr_getstackaddr \
+  pthread_attr_getstacksize \
   pthread_attr_init \
   pthread_attr_setaffinity \
   pthread_attr_setdetachstate \
@@ -196,7 +197,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_getstacksize \
   pthread_attr_setguardsize \
   pthread_attr_setstack \
   pthread_attr_setstackaddr \
diff --git a/nptl/Versions b/nptl/Versions
index 541f0a1ff0..0742f8fb43 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -74,6 +74,7 @@ libc {
   GLIBC_2.1 {
     pthread_attr_getguardsize;
     pthread_attr_getstackaddr;
+    pthread_attr_getstacksize;
     pthread_attr_init;
     pthread_mutexattr_gettype;
     pthread_mutexattr_settype;
@@ -246,6 +247,7 @@ libc {
     pthread_attr_getguardsize;
     pthread_attr_getstack;
     pthread_attr_getstackaddr;
+    pthread_attr_getstacksize;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -394,7 +396,6 @@ libpthread {
   }
 
   GLIBC_2.1 {
-    pthread_attr_getstacksize;
     pthread_attr_setguardsize;
     pthread_attr_setstackaddr;
     pthread_attr_setstacksize;
diff --git a/nptl/pthread_attr_getstacksize.c b/nptl/pthread_attr_getstacksize.c
index 74404ce367..4b247cb31c 100644
--- a/nptl/pthread_attr_getstacksize.c
+++ b/nptl/pthread_attr_getstacksize.c
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
 __pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *stacksize)
@@ -40,4 +40,9 @@ __pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *stacksize)
 
   return 0;
 }
-strong_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize)
+versioned_symbol (libc, __pthread_attr_getstacksize,
+                  pthread_attr_getstacksize, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_getstacksize,
+               pthread_attr_getstacksize, GLIBC_2_1);
+#endif