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:10 +0200 |
| commit | b5668f08ea2d6fa9dbb5046e2aee341d33d7cf13 (patch) | |
| tree | 6100fb7c0b1b6b99943a47da6da77ecd0664a525 /nptl | |
| parent | f5bc5f6e2a96b8b03d1bf8199a58b1accc3c4c53 (diff) | |
| download | glibc-b5668f08ea2d6fa9dbb5046e2aee341d33d7cf13.tar.gz glibc-b5668f08ea2d6fa9dbb5046e2aee341d33d7cf13.tar.xz glibc-b5668f08ea2d6fa9dbb5046e2aee341d33d7cf13.zip | |
nptl: Move pthread_attr_getguardsize 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_getguardsize.c | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index d55f8c6b00..bb30f01045 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -63,6 +63,7 @@ routines = \ pthread_attr_extension \ pthread_attr_getaffinity \ pthread_attr_getdetachstate \ + pthread_attr_getguardsize \ pthread_attr_getinheritsched \ pthread_attr_getschedparam \ pthread_attr_getschedpolicy \ @@ -193,7 +194,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ pt-interp \ - pthread_attr_getguardsize \ pthread_attr_getstack \ pthread_attr_getstackaddr \ pthread_attr_getstacksize \ diff --git a/nptl/Versions b/nptl/Versions index d36c2b12ea..536d69a588 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -72,6 +72,7 @@ libc { sem_wait; } GLIBC_2.1 { + pthread_attr_getguardsize; pthread_attr_init; pthread_mutexattr_gettype; pthread_mutexattr_settype; @@ -240,6 +241,7 @@ libc { mtx_trylock; mtx_unlock; pthread_attr_getaffinity_np; + pthread_attr_getguardsize; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; @@ -388,7 +390,6 @@ libpthread { } GLIBC_2.1 { - pthread_attr_getguardsize; pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_setguardsize; diff --git a/nptl/pthread_attr_getguardsize.c b/nptl/pthread_attr_getguardsize.c index a59bc9b283..485bd4c2df 100644 --- a/nptl/pthread_attr_getguardsize.c +++ b/nptl/pthread_attr_getguardsize.c @@ -17,10 +17,10 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize) +__pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize) { struct pthread_attr *iattr; @@ -30,3 +30,9 @@ pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize) return 0; } +versioned_symbol (libpthread, __pthread_attr_getguardsize, + pthread_attr_getguardsize, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_attr_getguardsize, + pthread_attr_getguardsize, GLIBC_2_1); +#endif |