htl: move __thread_set_pcsptp into libc.

Message-ID: <20250815181500.107433-9-gfleury@disroot.org>

diff --git a/htl/Makefile b/htl/Makefile
index 6c04a276b9145809486e0a7864d804519acfe2a2..88f65c419ad7a942c9fab3f93890685ac8eca13b 100644 (file)
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -41,7 +41,6 @@ libpthread-routines := \
   pt-docancel \
   pt-sysdep \
   pt-setup \
-  pt-machdep \
   pt-spin \
   pt-sigstate-init \
   pt-kill \
@@ -154,6 +153,7 @@ routines := \
   pt-init-specific \
   pt-key-create \
   pt-key-delete \
+  pt-machdep \
   pt-mutex-checklocked \
   pt-mutex-consistent \
   pt-mutex-destroy \

diff --git a/htl/Versions b/htl/Versions
index e6bd128925962605e59902dbf820b81fb7ebe81a..e5ff9186aa016e0fe85d8f15edae51c0422b9cee 100644 (file)
--- a/htl/Versions
+++ b/htl/Versions
@@ -256,6 +256,7 @@ libc {
     __pthread_thread_start;
     __pthread_thread_terminate;
     __pthread_wakeup;
+    __thread_set_pcsptp;
   }
 }
 

diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.h b/sysdeps/mach/hurd/htl/pt-sysdep.h
index fb451e0cc23ff7836e0d9eaa2c90329649fa069f..1b727069dff1d9b16997702cba8ea8daa7f3177c 100644 (file)
--- a/sysdeps/mach/hurd/htl/pt-sysdep.h
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.h
@@ -69,6 +69,6 @@ __pthread_stack_dealloc (void *stackaddr, size_t stacksize)
 extern int __thread_set_pcsptp (thread_t thread,
                                int set_pc, void *pc,
                                int set_sp, void *sp, int set_tp, void *tp);
-
+libc_hidden_proto (__thread_set_pcsptp)
 
 #endif /* pt-sysdep.h */

diff --git a/sysdeps/mach/hurd/i386/htl/pt-machdep.c b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
index fd3eb861a1dccec1c9d5f34b1608dbc554364a98..06c746d31384e1435d0179b0bdf6def177331475 100644 (file)
--- a/sysdeps/mach/hurd/i386/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/i386/htl/pt-machdep.c
@@ -23,6 +23,7 @@
 #include <mach/i386/mach_i386.h>
 #include <mach/mig_errors.h>
 #include <mach/thread_status.h>
+#include <pt-sysdep.h>
 
 #define HURD_TLS_DESC_DECL(desc, tcb)                                        \
   struct descriptor desc =                                                   \
@@ -80,3 +81,4 @@ __thread_set_pcsptp (thread_t thread,
 
   return 0;
 }
+libc_hidden_def (__thread_set_pcsptp)

diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
index 9281545ee80c1860d16380f054aaf2ec29663e45..f3e3d0a11e2e0c59209a9576acd0db8b25c60dfb 100644 (file)
--- a/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
+++ b/sysdeps/mach/hurd/x86_64/htl/pt-machdep.c
@@ -24,6 +24,7 @@
 #include <mach/x86_64/mach_i386.h>
 #include <mach/mig_errors.h>
 #include <mach/thread_status.h>
+#include <pt-sysdep.h>
 
 int
 __thread_set_pcsptp (thread_t thread,
@@ -71,3 +72,4 @@ __thread_set_pcsptp (thread_t thread,
 
   return 0;
 }
+libc_hidden_def (__thread_set_pcsptp)