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:14 +0200 |
| commit | ee092efed40d667b313f0d38c91941499a01bf06 (patch) | |
| tree | 5571ecfe04ec5157da635316f4a2e598ddac0de0 | |
| parent | b5e75df2a5afef1a270a6dbc4a732e830ad212a4 (diff) | |
| download | 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>
64 files changed, 74 insertions, 33 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 diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 8ec95fcd8f..3db215e742 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1452,6 +1452,7 @@ GLIBC_2.17 pthread_attr_getschedpolicy F GLIBC_2.17 pthread_attr_getscope F GLIBC_2.17 pthread_attr_getstack F GLIBC_2.17 pthread_attr_getstackaddr F +GLIBC_2.17 pthread_attr_getstacksize F GLIBC_2.17 pthread_attr_init F GLIBC_2.17 pthread_attr_setaffinity_np F GLIBC_2.17 pthread_attr_setdetachstate F @@ -2328,6 +2329,7 @@ GLIBC_2.34 pthread_attr_getaffinity_np F GLIBC_2.34 pthread_attr_getguardsize F GLIBC_2.34 pthread_attr_getstack F GLIBC_2.34 pthread_attr_getstackaddr F +GLIBC_2.34 pthread_attr_getstacksize F GLIBC_2.34 pthread_barrier_destroy F GLIBC_2.34 pthread_barrier_init F GLIBC_2.34 pthread_barrier_wait F diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 73434af8dd..1bce98bc96 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.17 __pthread_register_cancel F GLIBC_2.17 __pthread_register_cancel_defer F GLIBC_2.17 __pthread_unregister_cancel F GLIBC_2.17 __pthread_unregister_cancel_restore F -GLIBC_2.17 pthread_attr_getstacksize F GLIBC_2.17 pthread_attr_setguardsize F GLIBC_2.17 pthread_attr_setstack F GLIBC_2.17 pthread_attr_setstackaddr F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 6cdf7d6baa..7e4d769b11 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -1614,6 +1614,7 @@ GLIBC_2.1 printf_size F GLIBC_2.1 printf_size_info F GLIBC_2.1 pthread_attr_getguardsize F GLIBC_2.1 pthread_attr_getstackaddr F +GLIBC_2.1 pthread_attr_getstacksize F GLIBC_2.1 pthread_attr_init F GLIBC_2.1 pthread_mutexattr_gettype F GLIBC_2.1 pthread_mutexattr_settype F @@ -2416,6 +2417,7 @@ GLIBC_2.34 pthread_attr_getaffinity_np F GLIBC_2.34 pthread_attr_getguardsize F GLIBC_2.34 pthread_attr_getstack F GLIBC_2.34 pthread_attr_getstackaddr F +GLIBC_2.34 pthread_attr_getstacksize F GLIBC_2.34 pthread_barrier_destroy F GLIBC_2.34 pthread_barrier_init F GLIBC_2.34 pthread_barrier_wait F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 0d7787af1d..88575bef01 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -1,7 +1,6 @@ GLIBC_2.0 __errno_location F GLIBC_2.0 pthread_cancel F GLIBC_2.0 pthread_create F -GLIBC_2.1 pthread_attr_getstacksize F GLIBC_2.1 pthread_attr_setguardsize F GLIBC_2.1 pthread_attr_setstackaddr F GLIBC_2.1 pthread_attr_setstacksize F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index 0a322ae797..cdacfbde84 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1390,6 +1390,7 @@ GLIBC_2.32 pthread_attr_getscope F GLIBC_2.32 pthread_attr_getsigmask_np F GLIBC_2.32 pthread_attr_getstack F GLIBC_2.32 pthread_attr_getstackaddr F +GLIBC_2.32 pthread_attr_getstacksize F GLIBC_2.32 pthread_attr_init F GLIBC_2.32 pthread_attr_setaffinity_np F GLIBC_2.32 pthread_attr_setdetachstate F @@ -2087,6 +2088,7 @@ GLIBC_2.34 pthread_attr_getaffinity_np F GLIBC_2.34 pthread_attr_getguardsize F GLIBC_2.34 pthread_attr_getstack F GLIBC_2.34 pthread_attr_getstackaddr F |
