[PATCH 6/8] htl: move pthread_mutexattr_setpshared, pthread_mutexattr_getpshared into libc.
gfleury
gfleury@disroot.org
Tue Dec 31 13:49:07 GMT 2024
---
htl/Makefile | 4 ++--
htl/Versions | 4 ++--
sysdeps/htl/pthreadP.h | 6 ++++++
sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c | 11 +++++++++--
sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c | 12 ++++++++++--
sysdeps/mach/hurd/i386/libc.abilist | 4 ++++
sysdeps/mach/hurd/i386/libpthread.abilist | 2 --
sysdeps/mach/hurd/x86_64/libc.abilist | 4 ++++
sysdeps/mach/hurd/x86_64/libpthread.abilist | 2 --
9 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/htl/Makefile b/htl/Makefile
index f78b1ff6..80b9e62d 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -55,9 +55,7 @@ libpthread-routines := \
pt-testcancel \
pt-cancel \
pt-mutexattr-getprioceiling \
- pt-mutexattr-getpshared \
pt-mutexattr-setprioceiling \
- pt-mutexattr-setpshared \
pt-mutexattr-getrobust \
pt-mutexattr-setrobust \
pt-mutex-init \
@@ -197,9 +195,11 @@ routines := \
pt-mutex-checklocked \
pt-mutexattr-destroy \
pt-mutexattr-getprotocol \
+ pt-mutexattr-getpshared \
pt-mutexattr-gettype \
pt-mutexattr-init \
pt-mutexattr-setprotocol \
+ pt-mutexattr-setpshared \
pt-mutexattr-settype \
pt-nthreads \
pt-pthread_self \
diff --git a/htl/Versions b/htl/Versions
index 0b7f0c3f..9bb13592 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -40,9 +40,11 @@ libc {
pthread_condattr_setpshared;
pthread_mutexattr_destroy;
pthread_mutexattr_getprotocol;
+ pthread_mutexattr_getpshared;
pthread_mutexattr_gettype;
pthread_mutexattr_init;
pthread_mutexattr_setprotocol;
+ pthread_mutexattr_setpshared;
pthread_mutexattr_settype;
pthread_sigmask;
}
@@ -184,9 +186,7 @@ libpthread {
pthread_mutex_trylock; pthread_mutex_unlock;
pthread_mutexattr_getprioceiling;
- pthread_mutexattr_getpshared;
pthread_mutexattr_setprioceiling;
- pthread_mutexattr_setpshared;
pthread_once;
diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h
index 45b56327..b729edfe 100644
--- a/sysdeps/htl/pthreadP.h
+++ b/sysdeps/htl/pthreadP.h
@@ -39,6 +39,12 @@ extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,
const struct timespec *__abstime);
extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex);
extern int __pthread_mutexattr_settype (pthread_mutexattr_t *attr, int kind);
+extern int __pthread_mutexattr_getpshared(const pthread_mutexattr_t *__restrict __attr,
+ int *__restrict __pshared);
+libc_hidden_proto (__pthread_mutexattr_getpshared)
+extern int __pthread_mutexattr_setpshared(pthread_mutexattr_t *__attr,
+ int __pshared);
+libc_hidden_proto (__pthread_mutexattr_setpshared)
#ifdef __USE_UNIX98
extern int __pthread_mutexattr_getprotocol(const pthread_mutexattr_t *__restrict __attr,
diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c
index a470f5a0..9de7f327 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getpshared.c
@@ -16,16 +16,23 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <pthread.h>
+#include <pthreadP.h>
#include <stdlib.h>
#include <assert.h>
#include <pt-internal.h>
#include "pt-mutex.h"
#include <hurdlock.h>
+#include <shlib-compat.h>
int
-pthread_mutexattr_getpshared (const pthread_mutexattr_t *attrp, int *outp)
+__pthread_mutexattr_getpshared (const pthread_mutexattr_t *attrp, int *outp)
{
*outp = attrp->__pshared;
return 0;
}
+libc_hidden_def (__pthread_mutexattr_getpshared)
+versioned_symbol (libc, __pthread_mutexattr_getpshared, pthread_mutexattr_getpshared, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_getpshared,pthread_mutexattr_getpshared, GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c
index 5cead752..6e6d9281 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setpshared.c
@@ -16,15 +16,16 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <pthread.h>
+#include <pthreadP.h>
#include <stdlib.h>
#include <assert.h>
#include <pt-internal.h>
#include "pt-mutex.h"
#include <hurdlock.h>
+#include <shlib-compat.h>
int
-pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared)
+__pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared)
{
if (pshared != PTHREAD_PROCESS_PRIVATE && pshared != PTHREAD_PROCESS_SHARED)
return EINVAL;
@@ -32,3 +33,10 @@ pthread_mutexattr_setpshared (pthread_mutexattr_t *attrp, int pshared)
attrp->__pshared = pshared;
return 0;
}
+
+libc_hidden_def (__pthread_mutexattr_setpshared)
+versioned_symbol (libc, __pthread_mutexattr_setpshared, pthread_mutexattr_setpshared, GLIBC_2_41);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_setpshared,pthread_mutexattr_setpshared, GLIBC_2_12);
+#endif
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 5ede5a29..43ee36e6 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -65,9 +65,11 @@ GLIBC_2.12 pthread_equal F
GLIBC_2.12 pthread_getschedparam F
GLIBC_2.12 pthread_mutexattr_destroy F
GLIBC_2.12 pthread_mutexattr_getprotocol F
+GLIBC_2.12 pthread_mutexattr_getpshared F
GLIBC_2.12 pthread_mutexattr_gettype F
GLIBC_2.12 pthread_mutexattr_init F
GLIBC_2.12 pthread_mutexattr_setprotocol F
+GLIBC_2.12 pthread_mutexattr_setpshared F
GLIBC_2.12 pthread_mutexattr_settype F
GLIBC_2.12 pthread_self F
GLIBC_2.12 pthread_setschedparam F
@@ -2528,8 +2530,10 @@ GLIBC_2.41 pthread_condattr_getpshared F
GLIBC_2.41 pthread_condattr_setclock F
GLIBC_2.41 pthread_condattr_setpshared F
GLIBC_2.41 pthread_mutexattr_getprotocol F
+GLIBC_2.41 pthread_mutexattr_getpshared F
GLIBC_2.41 pthread_mutexattr_gettype F
GLIBC_2.41 pthread_mutexattr_setprotocol F
+GLIBC_2.41 pthread_mutexattr_setpshared F
GLIBC_2.41 pthread_sigmask F
GLIBC_2.5 __readlinkat_chk F
GLIBC_2.5 inet6_opt_append F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index 0ba4f8e9..cf6b71a0 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -51,9 +51,7 @@ GLIBC_2.12 pthread_mutex_transfer_np F
GLIBC_2.12 pthread_mutex_trylock F
GLIBC_2.12 pthread_mutex_unlock F
GLIBC_2.12 pthread_mutexattr_getprioceiling F
-GLIBC_2.12 pthread_mutexattr_getpshared F
GLIBC_2.12 pthread_mutexattr_setprioceiling F
-GLIBC_2.12 pthread_mutexattr_setpshared F
GLIBC_2.12 pthread_once F
GLIBC_2.12 pthread_rwlock_destroy F
GLIBC_2.12 pthread_rwlock_init F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 4bff3073..aba86092 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1553,9 +1553,11 @@ GLIBC_2.38 pthread_mutex_lock F
GLIBC_2.38 pthread_mutex_unlock F
GLIBC_2.38 pthread_mutexattr_destroy F
GLIBC_2.38 pthread_mutexattr_getprotocol F
+GLIBC_2.38 pthread_mutexattr_getpshared F
GLIBC_2.38 pthread_mutexattr_gettype F
GLIBC_2.38 pthread_mutexattr_init F
GLIBC_2.38 pthread_mutexattr_setprotocol F
+GLIBC_2.38 pthread_mutexattr_setpshared F
GLIBC_2.38 pthread_mutexattr_settype F
GLIBC_2.38 pthread_self F
GLIBC_2.38 pthread_setcancelstate F
@@ -2217,8 +2219,10 @@ GLIBC_2.41 pthread_condattr_getpshared F
GLIBC_2.41 pthread_condattr_setclock F
GLIBC_2.41 pthread_condattr_setpshared F
GLIBC_2.41 pthread_mutexattr_getprotocol F
+GLIBC_2.41 pthread_mutexattr_getpshared F
GLIBC_2.41 pthread_mutexattr_gettype F
GLIBC_2.41 pthread_mutexattr_setprotocol F
+GLIBC_2.41 pthread_mutexattr_setpshared F
GLIBC_2.41 pthread_sigmask F
HURD_CTHREADS_0.3 __cthread_getspecific F
HURD_CTHREADS_0.3 __cthread_keycreate F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index bd8a0363..866890ca 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -74,11 +74,9 @@ GLIBC_2.38 pthread_mutex_transfer_np F
GLIBC_2.38 pthread_mutex_trylock F
GLIBC_2.38 pthread_mutex_unlock F
GLIBC_2.38 pthread_mutexattr_getprioceiling F
-GLIBC_2.38 pthread_mutexattr_getpshared F
GLIBC_2.38 pthread_mutexattr_getrobust F
GLIBC_2.38 pthread_mutexattr_getrobust_np F
GLIBC_2.38 pthread_mutexattr_setprioceiling F
-GLIBC_2.38 pthread_mutexattr_setpshared F
GLIBC_2.38 pthread_mutexattr_setrobust F
GLIBC_2.38 pthread_mutexattr_setrobust_np F
GLIBC_2.38 pthread_once F
--
2.39.5
More information about the Libc-alpha
mailing list