htl: move __pthread_timedblock, __pthread_timedblock_intr, __pthread_block, __pthread...

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

diff --git a/htl/Makefile b/htl/Makefile
index 542f5eadf017cc4c5f2535fa3ef71f053c021cf3..683ca4bc4efca3e28b4995cfd2743c2edcbe3b54 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -102,10 +102,6 @@ libpthread-routines := \
   pt-startup \
   pt-getconcurrency \
   pt-setconcurrency \
-  pt-block \
-  pt-timedblock \
-  pt-block-intr \
-  pt-timedblock-intr \
   pt-docancel \
   pt-sysdep \
   pt-setup \
@@ -191,6 +187,8 @@ routines := \
   pt-attr-setstack \
   pt-attr-setstackaddr \
   pt-attr-setstacksize \
+  pt-block \
+  pt-block-intr \
   pt-cond \
   pt-cond-brdcast \
   pt-cond-destroy \
@@ -210,6 +208,8 @@ routines := \
   pt-sigmask \
   pt-sigstate \
   pt-sigstate-destroy \
+  pt-timedblock \
+  pt-timedblock-intr \
   pt-wakeup \
   # routines
 shared-only-routines = forward

diff --git a/htl/Versions b/htl/Versions
index 465db4960a5505ad9b29603b4771a6429136efc5..3fa6b936a2c542060908109ce9fb2ace0b9a6cd0 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -89,6 +89,8 @@ libc {
     __pthread_cleanup_stack;
     __pthread_total;
     ___pthread_self;
+    __pthread_block;
+    __pthread_block_intr;
     __pthread_init_thread;
     __pthread_default_attr;
     __pthread_attr_init;
@@ -107,6 +109,8 @@ libc {
     __pthread_sigstate;
     __pthread_sigstate_destroy;
     __pthread_sigmask;
+    __pthread_timedblock;
+    __pthread_timedblock_intr;
     __pthread_wakeup;
   }
 }

diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index de459d7380a9a65cf89faad21917469c46d7bedd..1e4d92d0d7415b8388089d456f3fa1315705af11 100644 (file)
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -267,20 +267,22 @@ extern void __pthread_startup (void);
 
 /* Block THREAD.  */
 extern void __pthread_block (struct __pthread *thread);
+libc_hidden_proto (__pthread_block)
 
 /* Block THREAD until *ABSTIME is reached.  */
 extern error_t __pthread_timedblock (struct __pthread *__restrict thread,
                                     const struct timespec *__restrict abstime,
                                     clockid_t clock_id);
-
+libc_hidden_proto (__pthread_timedblock)
 /* Block THREAD with interrupts.  */
 extern error_t __pthread_block_intr (struct __pthread *thread);
+libc_hidden_proto (__pthread_block_intr)
 
 /* Block THREAD until *ABSTIME is reached, with interrupts.  */
 extern error_t __pthread_timedblock_intr (struct __pthread *__restrict thread,
                                          const struct timespec *__restrict abstime,
                                          clockid_t clock_id);
-
+libc_hidden_proto (__pthread_timedblock_intr)
 /* Wakeup THREAD.  */
 extern void __pthread_wakeup (struct __pthread *thread);
 libc_hidden_proto (__pthread_wakeup)

diff --git a/sysdeps/mach/htl/pt-block.c b/sysdeps/mach/htl/pt-block.c
index 7eb2bf09bf7b2ede6c91013670639ff0a73b4e7f..1655ef87343c2a084aeee33c59434f94c614df00 100644 (file)
--- a/sysdeps/mach/htl/pt-block.c
+++ b/sysdeps/mach/htl/pt-block.c
@@ -51,3 +51,4 @@ __pthread_block (struct __pthread *thread)
   assert_perror (err);
   RETURN(0);
 }
+libc_hidden_def (__pthread_block)

diff --git a/sysdeps/mach/htl/pt-timedblock.c b/sysdeps/mach/htl/pt-timedblock.c
index da1d47e3c26c0bb714458332df587403e5b7b66b..ddd0e031e1e710eb40f7e0fd41f2a39180f4ab3f 100644 (file)
--- a/sysdeps/mach/htl/pt-timedblock.c
+++ b/sysdeps/mach/htl/pt-timedblock.c
@@ -69,3 +69,4 @@ __pthread_timedblock (struct __pthread *thread,
   assert_perror (err);
   return 0;
 }
+libc_hidden_def (__pthread_timedblock)