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:15 +0200 |
| commit | da069d171482032231e1472f8b256f3c043e585f (patch) | |
| tree | bd887bc56ec0d5027a265b4b6a5349032eebd21c /nptl | |
| parent | ee092efed40d667b313f0d38c91941499a01bf06 (diff) | |
| download | glibc-da069d171482032231e1472f8b256f3c043e585f.zip glibc-da069d171482032231e1472f8b256f3c043e585f.tar.gz glibc-da069d171482032231e1472f8b256f3c043e585f.tar.bz2 | |
nptl: Move pthread_attr_setguardsize 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_setguardsize.c | 10 |
3 files changed, 11 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index e785772..9bd601a 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -75,6 +75,7 @@ routines = \ pthread_attr_init \ pthread_attr_setaffinity \ pthread_attr_setdetachstate \ + pthread_attr_setguardsize \ pthread_attr_setinheritsched \ pthread_attr_setschedparam \ pthread_attr_setschedpolicy \ @@ -197,7 +198,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ pt-interp \ - pthread_attr_setguardsize \ pthread_attr_setstack \ pthread_attr_setstackaddr \ pthread_attr_setstacksize \ diff --git a/nptl/Versions b/nptl/Versions index 0742f8f..c7e8cb5 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -76,6 +76,7 @@ libc { pthread_attr_getstackaddr; pthread_attr_getstacksize; pthread_attr_init; + pthread_attr_setguardsize; pthread_mutexattr_gettype; pthread_mutexattr_settype; pthread_rwlock_destroy; @@ -248,6 +249,7 @@ libc { pthread_attr_getstack; pthread_attr_getstackaddr; pthread_attr_getstacksize; + pthread_attr_setguardsize; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; @@ -396,7 +398,6 @@ libpthread { } GLIBC_2.1 { - pthread_attr_setguardsize; pthread_attr_setstackaddr; pthread_attr_setstacksize; pthread_create; diff --git a/nptl/pthread_attr_setguardsize.c b/nptl/pthread_attr_setguardsize.c index 58f4733..24b5d6b 100644 --- a/nptl/pthread_attr_setguardsize.c +++ b/nptl/pthread_attr_setguardsize.c @@ -17,10 +17,10 @@ <https://www.gnu.org/licenses/>. */ #include "pthreadP.h" - +#include <shlib-compat.h> int -pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize) +__pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize) { struct pthread_attr *iattr; @@ -33,3 +33,9 @@ pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize) return 0; } +versioned_symbol (libpthread, __pthread_attr_setguardsize, + pthread_attr_setguardsize, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __pthread_attr_setguardsize, + pthread_attr_setguardsize, GLIBC_2_1); +#endif |