From: gfleury <gfleury@disroot.org>
Date: Fri, 15 Aug 2025 18:14:49 +0000 (+0200)
Subject: htl: move __thread_set_pcsptp into libc.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0b765d9ba9fee6ee97df9597131cfe3ce80309b;p=thirdparty%2Fglibc.git

htl: move __thread_set_pcsptp into libc.

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

diff --git a/htl/Makefile b/htl/Makefile
index 6c04a276b9..88f65c419a 100644
--- 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 e6bd128925..e5ff9186aa 100644
--- 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 fb451e0cc2..1b727069df 100644
--- 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 fd3eb861a1..06c746d313 100644
--- 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 9281545ee8..f3e3d0a11e 100644
--- 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)