From: gfleury <gfleury@disroot.org>
Date: Thu, 19 Dec 2024 20:37:26 +0000 (+0200)
Subject: htl: move __pthread_mutex_checklocked into libc.
X-Git-Tag: glibc-2.41~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba8522542fc2f1fa0a928432be91b9456ad745da;p=thirdparty%2Fglibc.git

htl: move __pthread_mutex_checklocked into libc.

move out __getpid from pt-mutex.h
and in pt-mutex-* include <unistd.h> where
__getpid was called

Signed-off-by: gfleury <gfleury@disroot.org>
Message-ID: <20241219203727.669825-8-gfleury@disroot.org>
---

diff --git a/htl/Makefile b/htl/Makefile
index 683ca4bc4e..1c454d4d3e 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -68,7 +68,6 @@ libpthread-routines := \
   pt-mutexattr-setrobust \
   pt-mutex-init \
   pt-mutex-destroy \
-  pt-mutex-checklocked \
   pt-mutex-lock \
   pt-mutex-trylock \
   pt-mutex-timedlock \
@@ -201,6 +200,7 @@ routines := \
   pt-condattr-setclock \
   pt-condattr-setpshared \
   pt-getschedparam \
+  pt-mutex-checklocked \
   pt-nthreads \
   pt-pthread_self \
   pt-self pt-equal \
diff --git a/htl/Versions b/htl/Versions
index 3fa6b936a2..95cf7fe4c2 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -106,6 +106,7 @@ libc {
     __pthread_cond_signal;
     __pthread_condattr_init;
     __pthread_default_condattr;
+    __pthread_mutex_checklocked;
     __pthread_sigstate;
     __pthread_sigstate_destroy;
     __pthread_sigmask;
diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index 1e4d92d0d7..ec71fe1867 100644
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -319,6 +319,7 @@ libc_hidden_proto (__pthread_sigstate)
 
 /* If supported, check that MUTEX is locked by the caller.  */
 extern int __pthread_mutex_checklocked (pthread_mutex_t *mtx);
+libc_hidden_proto (__pthread_mutex_checklocked)
 
 
 /* Default thread attributes.  */
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c b/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c
index c6afa0d3ef..2a3ce3c545 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-checklocked.c
@@ -22,6 +22,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 __pthread_mutex_checklocked (pthread_mutex_t *mtxp)
@@ -49,3 +50,4 @@ __pthread_mutex_checklocked (pthread_mutex_t *mtxp)
 
   return ret;
 }
+libc_hidden_def (__pthread_mutex_checklocked)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-consistent.c b/sysdeps/mach/hurd/htl/pt-mutex-consistent.c
index bd41eb23c1..56b1103332 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-consistent.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-consistent.c
@@ -22,6 +22,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 pthread_mutex_consistent (pthread_mutex_t *mtxp)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-lock.c b/sysdeps/mach/hurd/htl/pt-mutex-lock.c
index 3df26f4344..12dae49cf2 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-lock.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-lock.c
@@ -22,6 +22,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 __pthread_mutex_lock (pthread_mutex_t *mtxp)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
index 30aff2c411..11cea03da0 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-timedlock.c
@@ -22,6 +22,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 __pthread_mutex_clocklock (pthread_mutex_t *mtxp,
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-transfer-np.c b/sysdeps/mach/hurd/htl/pt-mutex-transfer-np.c
index d3aaaadd54..c66a97b4fd 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-transfer-np.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-transfer-np.c
@@ -23,6 +23,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 __pthread_mutex_transfer_np (pthread_mutex_t *mtxp, pthread_t th)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-trylock.c b/sysdeps/mach/hurd/htl/pt-mutex-trylock.c
index c232dc7a4f..34589459bb 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-trylock.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-trylock.c
@@ -22,6 +22,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 __pthread_mutex_trylock (pthread_mutex_t *mtxp)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex-unlock.c b/sysdeps/mach/hurd/htl/pt-mutex-unlock.c
index e85ba2c8ca..238728e471 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex-unlock.c
+++ b/sysdeps/mach/hurd/htl/pt-mutex-unlock.c
@@ -22,6 +22,7 @@
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <unistd.h>
 
 int
 __pthread_mutex_unlock (pthread_mutex_t *mtxp)
diff --git a/sysdeps/mach/hurd/htl/pt-mutex.h b/sysdeps/mach/hurd/htl/pt-mutex.h
index d9b7eec29e..ca56944718 100644
--- a/sysdeps/mach/hurd/htl/pt-mutex.h
+++ b/sysdeps/mach/hurd/htl/pt-mutex.h
@@ -85,6 +85,4 @@
 #define MTX_TYPE(mtxp)   \
   ((mtxp)->__type | ((mtxp)->__flags & PTHREAD_MUTEX_ROBUST))
 
-extern int __getpid (void) __attribute__ ((const));
-
 #endif /* pt-mutex.h */