From 1a1cedd635506a1e5f97d19bcd03fad1c3c29c12 Mon Sep 17 00:00:00 2001 From: gfleury Date: Mon, 18 Nov 2024 13:21:44 +0200 Subject: [PATCH] htl: move pthread_attr_setguardsize into libc. Signed-off-by: gfleury --- htl/Makefile | 2 +- htl/Versions | 3 ++- sysdeps/htl/pt-attr-setguardsize.c | 8 +++++++- sysdeps/mach/hurd/i386/libc.abilist | 2 ++ sysdeps/mach/hurd/i386/libpthread.abilist | 1 - sysdeps/mach/hurd/x86_64/libc.abilist | 2 ++ sysdeps/mach/hurd/x86_64/libpthread.abilist | 1 - 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 555ab9b8cd..5c625d0ca9 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -26,7 +26,6 @@ LCLHDRS := libpthread-routines := \ pt-attr-init \ - pt-attr-setguardsize \ pt-barrier-destroy \ pt-barrier-init \ pt-barrier-wait \ @@ -199,6 +198,7 @@ routines := \ pt-attr-getstackaddr \ pt-attr-getstacksize \ pt-attr-setdetachstate \ + pt-attr-setguardsize \ pt-attr-setinheritsched \ pt-attr-setschedparam \ pt-attr-setschedpolicy \ diff --git a/htl/Versions b/htl/Versions index 8ecb2fd880..3374574869 100644 --- a/htl/Versions +++ b/htl/Versions @@ -19,6 +19,7 @@ libc { pthread_attr_getstacksize; pthread_attr_getstackaddr; pthread_attr_getstack; + pthread_attr_setguardsize; pthread_attr_setstacksize; pthread_attr_setstackaddr; pthread_attr_setstack; @@ -61,6 +62,7 @@ libc { pthread_attr_setstacksize; pthread_attr_setstackaddr; pthread_attr_setstack; + pthread_attr_setguardsize; } @@ -107,7 +109,6 @@ libpthread { pthread_atfork; pthread_attr_init; - pthread_attr_setguardsize; pthread_barrier_destroy; pthread_barrier_init; pthread_barrier_wait; pthread_barrierattr_destroy; pthread_barrierattr_getpshared; diff --git a/sysdeps/htl/pt-attr-setguardsize.c b/sysdeps/htl/pt-attr-setguardsize.c index 50a9a9a7a6..92cd2b58f2 100644 --- a/sysdeps/htl/pt-attr-setguardsize.c +++ b/sysdeps/htl/pt-attr-setguardsize.c @@ -17,11 +17,17 @@ . */ #include +#include #include int -pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize) +__pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize) { attr->__guardsize = guardsize; return 0; } +versioned_symbol (libpthread, __pthread_attr_setguardsize, pthread_attr_setguardsize, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_attr_setguardsize, pthread_attr_setguardsize, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 8fd21e66a1..0672f31a69 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -40,6 +40,7 @@ GLIBC_2.12 pthread_attr_getstack F GLIBC_2.12 pthread_attr_getstackaddr F GLIBC_2.12 pthread_attr_getstacksize F GLIBC_2.12 pthread_attr_setdetachstate F +GLIBC_2.12 pthread_attr_setguardsize F GLIBC_2.12 pthread_attr_setinheritsched F GLIBC_2.12 pthread_attr_setschedparam F GLIBC_2.12 pthread_attr_setschedpolicy F @@ -2497,6 +2498,7 @@ GLIBC_2.41 pthread_attr_getguardsize F GLIBC_2.41 pthread_attr_getstack F GLIBC_2.41 pthread_attr_getstackaddr F GLIBC_2.41 pthread_attr_getstacksize F +GLIBC_2.41 pthread_attr_setguardsize F GLIBC_2.41 pthread_attr_setstack F GLIBC_2.41 pthread_attr_setstackaddr F GLIBC_2.41 pthread_attr_setstacksize F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index ea40657e1d..86d79bbc35 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -23,7 +23,6 @@ GLIBC_2.12 ftrylockfile F GLIBC_2.12 funlockfile F GLIBC_2.12 pthread_atfork F GLIBC_2.12 pthread_attr_init F -GLIBC_2.12 pthread_attr_setguardsize F GLIBC_2.12 pthread_barrier_destroy F GLIBC_2.12 pthread_barrier_init F GLIBC_2.12 pthread_barrier_wait F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index f4f65ca353..f147fcb5c2 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1523,6 +1523,7 @@ GLIBC_2.38 pthread_attr_getstackaddr F GLIBC_2.38 pthread_attr_getstacksize F GLIBC_2.38 pthread_attr_init F GLIBC_2.38 pthread_attr_setdetachstate F +GLIBC_2.38 pthread_attr_setguardsize F GLIBC_2.38 pthread_attr_setinheritsched F GLIBC_2.38 pthread_attr_setschedparam F GLIBC_2.38 pthread_attr_setschedpolicy F @@ -2195,6 +2196,7 @@ GLIBC_2.41 pthread_attr_getguardsize F GLIBC_2.41 pthread_attr_getstack F GLIBC_2.41 pthread_attr_getstackaddr F GLIBC_2.41 pthread_attr_getstacksize F +GLIBC_2.41 pthread_attr_setguardsize F GLIBC_2.41 pthread_attr_setstack F GLIBC_2.41 pthread_attr_setstackaddr F GLIBC_2.41 pthread_attr_setstacksize F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index eef91700e9..9e156b16bf 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -40,7 +40,6 @@ GLIBC_2.38 mtx_timedlock F GLIBC_2.38 mtx_trylock F GLIBC_2.38 mtx_unlock F GLIBC_2.38 pthread_attr_init F -GLIBC_2.38 pthread_attr_setguardsize F GLIBC_2.38 pthread_barrier_destroy F GLIBC_2.38 pthread_barrier_init F GLIBC_2.38 pthread_barrier_wait F