diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-11 19:32:43 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-11 19:33:13 +0200 |
| commit | b5e75df2a5afef1a270a6dbc4a732e830ad212a4 (patch) | |
| tree | 0d2a7f803c57b9fd5ff895f6182911baab8a779f /nptl | |
| parent | fb7abc3441d7cb1970ae51cf546315ee43e3fb74 (diff) | |
| download | glibc-b5e75df2a5afef1a270a6dbc4a732e830ad212a4.zip glibc-b5e75df2a5afef1a270a6dbc4a732e830ad212a4.tar.gz glibc-b5e75df2a5afef1a270a6dbc4a732e830ad212a4.tar.bz2 | |
nptl: Move pthread_attr_getstackaddr 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/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/pthread_attr_getstackaddr.c | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 945956a..0844b52 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -70,6 +70,7 @@ routines = \ pthread_attr_getscope \ pthread_attr_getsigmask \ pthread_attr_getstack \ + pthread_attr_getstackaddr \ pthread_attr_init \ pthread_attr_setaffinity \ pthread_attr_setdetachstate \ @@ -195,7 +196,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ pt-interp \ - pthread_attr_getstackaddr \ pthread_attr_getstacksize \ pthread_attr_setguardsize \ pthread_attr_setstack \ diff --git a/nptl/Versions b/nptl/Versions index aa7ae59..541f0a1 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -73,6 +73,7 @@ libc { } GLIBC_2.1 { pthread_attr_getguardsize; + pthread_attr_getstackaddr; pthread_attr_init; pthread_mutexattr_gettype; pthread_mutexattr_settype; @@ -244,6 +245,7 @@ libc { pthread_attr_getaffinity_np; pthread_attr_getguardsize; pthread_attr_getstack; + pthread_attr_getstackaddr; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; @@ -392,7 +394,6 @@ libpthread { } GLIBC_2.1 { - pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_setguardsize; pthread_attr_setstackaddr; diff --git a/nptl/pthread_attr_getstackaddr.c b/nptl/pthread_attr_getstackaddr.c index e3e51c9..b245ae9 100644 --- a/nptl/pthread_attr_getstackaddr.c +++ b/nptl/pthread_attr_getstackaddr.c @@ -18,7 +18,7 @@ #include <errno.h> #include "pthreadP.h" - +#include <shlib-compat.h> int __pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr) @@ -34,7 +34,12 @@ __pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr) return 0; } -strong_alias (__pthread_attr_getstackaddr, pthread_attr_getstackaddr) +versioned_symbol (libc, __pthread_attr_getstackaddr, + pthread_attr_getstackaddr, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_attr_getstackaddr, + pthread_attr_getstackaddr, GLIBC_2_1); +#endif link_warning (pthread_attr_getstackaddr, "the use of `pthread_attr_getstackaddr' is deprecated, use `pthread_attr_getstack'") |