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:11 +0200
commitfb7abc3441d7cb1970ae51cf546315ee43e3fb74 (patch)
treeaebdf636531126ffef86833fc64df79889849a91 /nptl
parentb5668f08ea2d6fa9dbb5046e2aee341d33d7cf13 (diff)
downloadglibc-fb7abc3441d7cb1970ae51cf546315ee43e3fb74.tar.gz
glibc-fb7abc3441d7cb1970ae51cf546315ee43e3fb74.tar.xz
glibc-fb7abc3441d7cb1970ae51cf546315ee43e3fb74.zip
nptl: Move pthread_attr_getstack 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_getstack.c9
3 files changed, 10 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index bb30f01045..945956afb3 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -69,6 +69,7 @@ routines = \
   pthread_attr_getschedpolicy \
   pthread_attr_getscope \
   pthread_attr_getsigmask \
+  pthread_attr_getstack \
   pthread_attr_init \
   pthread_attr_setaffinity \
   pthread_attr_setdetachstate \
@@ -194,7 +195,6 @@ libpthread-routines = \
   libpthread-compat \
   nptl-init \
   pt-interp \
-  pthread_attr_getstack \
   pthread_attr_getstackaddr \
   pthread_attr_getstacksize \
   pthread_attr_setguardsize \
diff --git a/nptl/Versions b/nptl/Versions
index 536d69a588..aa7ae59df7 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -109,6 +109,7 @@ libc {
     __pthread_rwlock_trywrlock;
     __pthread_rwlock_unlock;
     __pthread_rwlock_wrlock;
+    pthread_attr_getstack;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -242,6 +243,7 @@ libc {
     mtx_unlock;
     pthread_attr_getaffinity_np;
     pthread_attr_getguardsize;
+    pthread_attr_getstack;
     pthread_barrier_destroy;
     pthread_barrier_init;
     pthread_barrier_wait;
@@ -409,7 +411,6 @@ libpthread {
   }
 
   GLIBC_2.2 {
-    pthread_attr_getstack;
     pthread_attr_setstack;
     pthread_getcpuclockid;
     pthread_yield;
diff --git a/nptl/pthread_attr_getstack.c b/nptl/pthread_attr_getstack.c
index 570115af10..351aa4da80 100644
--- a/nptl/pthread_attr_getstack.c
+++ b/nptl/pthread_attr_getstack.c
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include "pthreadP.h"
-
+#include <shlib-compat.h>
 
 int
 __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
@@ -37,4 +37,9 @@ __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
 
   return 0;
 }
-strong_alias (__pthread_attr_getstack, pthread_attr_getstack)
+versioned_symbol (libpthread, __pthread_attr_getstack,
+                  pthread_attr_getstack, GLIBC_2_34);
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_attr_getstack,
+               pthread_attr_getstack, GLIBC_2_2);
+#endif