[PATCH 2/4] htl: move ___pthread_self to libc

[Guy-Fleury Iteriteka <gfleury@disroot.org>]

htl/Makefile(routine): add pt-dep-self
htl/Versions(___pthread_self): add to libc symbol
sysdeps/mach/hurd/htl/pt-dep-self.c: New file
sysdeps/mach/hurd/htl/pt-sysdep.c(___pthread_seld): remove
				definition.
sysdeps/mach/hurd/htl/pt-sysdep.h(___pthread_self):
				add hidden property
---
 htl/Makefile                        |  3 ++-
 htl/Versions                        |  1 +
 sysdeps/mach/hurd/htl/pt-dep-self.c | 22 ++++++++++++++++++++++
 sysdeps/mach/hurd/htl/pt-sysdep.c   |  2 +-
 sysdeps/mach/hurd/htl/pt-sysdep.h   |  3 +++
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 sysdeps/mach/hurd/htl/pt-dep-self.c

diff --git a/htl/Makefile b/htl/Makefile
index ad0e2645..72e37fbd 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -164,7 +164,8 @@ headers :=				\
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total
+routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total \
+	    pt-dep-self
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 113110f4..9ec84811 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -31,6 +31,7 @@ libc {
     __libc_pthread_init;
     __pthread_cleanup_stack;
     __pthread_total;
+    ___pthread_self;
   }
 }
 
diff --git a/sysdeps/mach/hurd/htl/pt-dep-self.c b/sysdeps/mach/hurd/htl/pt-dep-self.c
new file mode 100644
index 00000000..82cb0524
--- /dev/null
+++ b/sysdeps/mach/hurd/htl/pt-dep-self.c
@@ -0,0 +1,22 @@
+/* Thread counter variable.
+   Copyright (C) 2021-2022 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "pt-sysdep.h"
+
+__thread struct __pthread *___pthread_self;
+libc_hidden_tls_def (___pthread_self)
diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.c b/sysdeps/mach/hurd/htl/pt-sysdep.c
index 2d828545..3597166d 100644
--- a/sysdeps/mach/hurd/htl/pt-sysdep.c
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.c
@@ -26,7 +26,7 @@
 #include <pt-internal.h>
 #include <pthreadP.h>
 
-__thread struct __pthread *___pthread_self;
+#include "pt-sysdep.h"
 
 static void
 reset_pthread_total (void)
diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.h b/sysdeps/mach/hurd/htl/pt-sysdep.h
index 854c365c..b28c60d0 100644
--- a/sysdeps/mach/hurd/htl/pt-sysdep.h
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.h
@@ -20,6 +20,7 @@
 #define _PT_SYSDEP_H	1
 
 #include <mach.h>
+#include <stddef.h>
 
 /* XXX */
 #define _POSIX_THREAD_THREADS_MAX	64
@@ -32,6 +33,8 @@
   mach_msg_header_t wakeupmsg;
 
 extern __thread struct __pthread *___pthread_self;
+libc_hidden_tls_proto (___pthread_self)
+
 #ifdef DEBUG
 #define _pthread_self()                                            \
 	({                                                         \
-- 
2.37.2