From a4b4b9a96b14d948063c18f789832ded5e38f506 Mon Sep 17 00:00:00 2001 From: gfleury Date: Tue, 26 Nov 2024 22:53:29 +0200 Subject: [PATCH] htl: move pthread_condattr_setpshared into libc. Signed-off-by: gfleury Message-ID: <20241126205329.2215295-8-gfleury@disroot.org> --- htl/Makefile | 2 +- htl/Versions | 4 ++-- sysdeps/htl/pt-condattr-setpshared.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(+), 6 deletions(-) diff --git a/htl/Makefile b/htl/Makefile index 56424aee98..b0bc0d97bf 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -92,7 +92,6 @@ libpthread-routines := \ pt-rwlock-timedrdlock \ pt-rwlock-timedwrlock \ pt-rwlock-unlock \ - pt-condattr-setpshared \ pt-cond-destroy \ pt-cond-init \ pt-cond-brdcast \ @@ -206,6 +205,7 @@ routines := \ pt-condattr-getpshared \ pt-condattr-init \ pt-condattr-setclock \ + pt-condattr-setpshared \ pt-getschedparam \ pt-nthreads \ pt-pthread_self \ diff --git a/htl/Versions b/htl/Versions index 533b871e42..33a3cfa7a5 100644 --- a/htl/Versions +++ b/htl/Versions @@ -31,6 +31,7 @@ libc { pthread_condattr_destroy; pthread_condattr_getpshared; pthread_condattr_setclock; + pthread_condattr_setpshared; } GLIBC_2.21 { @@ -72,6 +73,7 @@ libc { pthread_condattr_getclock; pthread_condattr_getpshared; pthread_condattr_setclock; + pthread_condattr_setpshared; } @@ -129,8 +131,6 @@ libpthread { pthread_cond_broadcast; pthread_cond_destroy; pthread_cond_init; pthread_cond_signal; pthread_cond_timedwait; pthread_cond_wait; - pthread_condattr_setpshared; - pthread_create; pthread_detach; pthread_exit; pthread_getattr_np; diff --git a/sysdeps/htl/pt-condattr-setpshared.c b/sysdeps/htl/pt-condattr-setpshared.c index c78906d22c..e8c8730488 100644 --- a/sysdeps/htl/pt-condattr-setpshared.c +++ b/sysdeps/htl/pt-condattr-setpshared.c @@ -17,10 +17,11 @@ . */ #include +#include #include int -pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared) +__pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared) { switch (pshared) { @@ -36,3 +37,8 @@ pthread_condattr_setpshared (pthread_condattr_t *attr, int pshared) } } stub_warning (pthread_condattr_setpshared) +versioned_symbol (libc, __pthread_condattr_setpshared, pthread_condattr_setpshared, GLIBC_2_41); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41) +compat_symbol (libpthread, __pthread_condattr_setpshared, pthread_condattr_setpshared, GLIBC_2_12); +#endif diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index a2cc574265..76ded62c80 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -54,6 +54,7 @@ GLIBC_2.12 pthread_condattr_getclock F GLIBC_2.12 pthread_condattr_getpshared F GLIBC_2.12 pthread_condattr_init F GLIBC_2.12 pthread_condattr_setclock F +GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_equal F GLIBC_2.12 pthread_getschedparam F GLIBC_2.12 pthread_self F @@ -2511,6 +2512,7 @@ GLIBC_2.41 pthread_attr_setstacksize F GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F +GLIBC_2.41 pthread_condattr_setpshared F GLIBC_2.5 __readlinkat_chk F GLIBC_2.5 inet6_opt_append F GLIBC_2.5 inet6_opt_find F diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index cd398f2fce..72cb549b24 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -36,7 +36,6 @@ GLIBC_2.12 pthread_cond_init F GLIBC_2.12 pthread_cond_signal F GLIBC_2.12 pthread_cond_timedwait F GLIBC_2.12 pthread_cond_wait F -GLIBC_2.12 pthread_condattr_setpshared F GLIBC_2.12 pthread_create F GLIBC_2.12 pthread_detach F GLIBC_2.12 pthread_exit F diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist index 2ff7027df4..c2ee0b1c1a 100644 --- a/sysdeps/mach/hurd/x86_64/libc.abilist +++ b/sysdeps/mach/hurd/x86_64/libc.abilist @@ -1542,6 +1542,7 @@ GLIBC_2.38 pthread_condattr_getclock F GLIBC_2.38 pthread_condattr_getpshared F GLIBC_2.38 pthread_condattr_init F GLIBC_2.38 pthread_condattr_setclock F +GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_equal F GLIBC_2.38 pthread_exit F GLIBC_2.38 pthread_getschedparam F @@ -2206,6 +2207,7 @@ GLIBC_2.41 pthread_attr_setstacksize F GLIBC_2.41 pthread_condattr_getclock F GLIBC_2.41 pthread_condattr_getpshared F GLIBC_2.41 pthread_condattr_setclock F +GLIBC_2.41 pthread_condattr_setpshared F HURD_CTHREADS_0.3 __cthread_getspecific F HURD_CTHREADS_0.3 __cthread_keycreate F HURD_CTHREADS_0.3 __cthread_setspecific F diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist index aa8f7802ce..bdadfd764a 100644 --- a/sysdeps/mach/hurd/x86_64/libpthread.abilist +++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist @@ -55,7 +55,6 @@ GLIBC_2.38 pthread_cond_init F GLIBC_2.38 pthread_cond_signal F GLIBC_2.38 pthread_cond_timedwait F GLIBC_2.38 pthread_cond_wait F -GLIBC_2.38 pthread_condattr_setpshared F GLIBC_2.38 pthread_create F GLIBC_2.38 pthread_detach F GLIBC_2.38 pthread_exit F