diff options
64 files changed, 75 insertions, 33 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index e7857720ba..9bd601ae57 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 0742f8fb43..c7e8cb579e 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 58f4733faa..24b5d6b59b 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 diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 3db215e742..4d8eb49a71 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1456,6 +1456,7 @@ 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 +GLIBC_2.17 pthread_attr_setguardsize F GLIBC_2.17 pthread_attr_setinheritsched F GLIBC_2.17 pthread_attr_setschedparam F GLIBC_2.17 pthread_attr_setschedpolicy F @@ -2330,6 +2331,7 @@ 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_attr_setguardsize 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 1bce98bc96..16116d4fb6 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_setguardsize F GLIBC_2.17 pthread_attr_setstack F GLIBC_2.17 pthread_attr_setstackaddr F GLIBC_2.17 pthread_attr_setstacksize F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 7e4d769b11..a48689b77f 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -1616,6 +1616,7 @@ 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_attr_setguardsize F GLIBC_2.1 pthread_mutexattr_gettype F GLIBC_2.1 pthread_mutexattr_settype F GLIBC_2.1 pthread_rwlock_destroy F @@ -2418,6 +2419,7 @@ 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_attr_setguardsize 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 88575bef01..790ca986c8 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_setguardsize F GLIBC_2.1 pthread_attr_setstackaddr F GLIBC_2.1 pthread_attr_setstacksize F GLIBC_2.1 pthread_create F diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist index cdacfbde84..2608419447 100644 --- a/sysdeps/unix/sysv/linux/arc/libc.abilist +++ b/sysdeps/unix/sysv/linux/arc/libc.abilist @@ -1394,6 +1394,7 @@ 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 +GLIBC_2.32 pthread_attr_setguardsize F GLIBC_2.32 pthread_attr_setinheritsched F GLIBC_2.32 pthread_attr_setschedparam F GLIBC_2.32 pthread_attr_setschedpolicy F @@ -2089,6 +2090,7 @@ 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_attr_setguardsize 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/arc/libpthread.abilist b/sysdeps/unix/sysv/linux/arc/libpthread.abilist index 506a7a81cc..43c5f2386b 100644 --- a/sysdeps/unix/sysv/linux/arc/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arc/libpthread.abilist @@ -3,7 +3,6 @@ GLIBC_2.32 __pthread_register_cancel F GLIBC_2.32 __pthread_register_cancel_defer F GLIBC_2.32 __pthread_unregister_cancel F GLIBC_2.32 __pthread_unregister_cancel_restore F -GLIBC_2.32 pthread_attr_setguardsize F GLIBC_2.32 pthread_attr_setstack F GLIBC_2.32 pthread_attr_setstackaddr F GLIBC_2.32 pthread_attr_setstacksize F diff --git a/sysdeps/unix/sysv/linux/arm/be/libc.abilist b/sysdeps/unix/sysv/linux/arm/be/libc.abilist index 15369ea584..d66fc |