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:19 +0200 |
| commit | 736c57c96cd1fd79905cf0f224ca6e3864eb71b4 (patch) | |
| tree | e759014c90e2f32bc1be855a45bc282b731fd6ca /nptl | |
| parent | b855e52bae0f754150fbad78c76d363b6eb2e53c (diff) | |
| download | glibc-736c57c96cd1fd79905cf0f224ca6e3864eb71b4.tar.gz glibc-736c57c96cd1fd79905cf0f224ca6e3864eb71b4.tar.xz glibc-736c57c96cd1fd79905cf0f224ca6e3864eb71b4.zip | |
nptl: Move pthread_attr_setstackaddr 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_setstackaddr.c | 9 |
3 files changed, 10 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index a4f1e91649..39feea52aa 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -83,6 +83,7 @@ routines = \ pthread_attr_setsigmask \ pthread_attr_setsigmask_internal \ pthread_attr_setstack \ + pthread_attr_setstackaddr \ pthread_barrier_destroy \ pthread_barrier_init \ pthread_barrier_wait \ @@ -199,7 +200,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ pt-interp \ - pthread_attr_setstackaddr \ pthread_attr_setstacksize \ pthread_cancel \ pthread_create \ diff --git a/nptl/Versions b/nptl/Versions index b96fadf49f..edf4da4c81 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -77,6 +77,7 @@ libc { pthread_attr_getstacksize; pthread_attr_init; pthread_attr_setguardsize; + pthread_attr_setstackaddr; pthread_mutexattr_gettype; pthread_mutexattr_settype; pthread_rwlock_destroy; @@ -252,6 +253,7 @@ libc { pthread_attr_getstacksize; pthread_attr_setguardsize; pthread_attr_setstack; + pthread_attr_setstackaddr; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; @@ -400,7 +402,6 @@ libpthread { } GLIBC_2.1 { - pthread_attr_setstackaddr; pthread_attr_setstacksize; pthread_create; pthread_getconcurrency; diff --git a/nptl/pthread_attr_setstackaddr.c b/nptl/pthread_attr_setstackaddr.c index 08633b551d..328339e364 100644 --- a/nptl/pthread_attr_setstackaddr.c +++ b/nptl/pthread_attr_setstackaddr.c @@ -18,7 +18,7 @@ #include <errno.h> #include "pthreadP.h" - +#include <shlib-compat.h> int __pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr) @@ -36,7 +36,12 @@ __pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr) return 0; } -strong_alias (__pthread_attr_setstackaddr, pthread_attr_setstackaddr) +versioned_symbol (libc, __pthread_attr_setstackaddr, + pthread_attr_setstackaddr, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_attr_setstackaddr, + pthread_attr_setstackaddr, GLIBC_2_1); +#endif link_warning (pthread_attr_setstackaddr, "the use of `pthread_attr_setstackaddr' is deprecated, use `pthread_attr_setstack'") |