htl: move pthread_attr_setguardsize into libc.

Signed-off-by: gfleury <gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 555ab9b8cd70eebc80c38a88a0ec817a887d656a..5c625d0ca9f1a0bb6c37576e8c13b29b2c375dbd 100644 (file)
--- 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 8ecb2fd88052c011d178e1c607b64c66283407b2..33745748695d86ee6431b35f2213515d0b505ab7 100644 (file)
--- 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 50a9a9a7a6c11e21fd4d38da6330d6cbc81f6911..92cd2b58f2a07dcd25152fe9be290e00572261e2 100644 (file)
--- a/sysdeps/htl/pt-attr-setguardsize.c
+++ b/sysdeps/htl/pt-attr-setguardsize.c
@@ -17,11 +17,17 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <pthread.h>
+#include <shlib-compat.h>
 #include <pt-internal.h>
 
 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 8fd21e66a19eef03f4a09084c30a634c54e10afb..0672f31a6966f76bdc466aef2e07a40fe2b17b1c 100644 (file)
--- 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 ea40657e1dcab6f47c03af7f0cbc99e36d2060a7..86d79bbc35f37239a30bd50670799d80be2d7187 100644 (file)
--- 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 f4f65ca3535ff9ddc3e2aca9aa19d76222111997..f147fcb5c22bf458d2450d671eb0a39a07dd7fb1 100644 (file)
--- 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 eef91700e979d5a8973ddf34ed7f68a0293365c1..9e156b16bfad041fd608f656df2856f80d34b0df 100644 (file)
--- 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