[glibc] htl: move ___pthread_self into libc.

[Samuel Thibault <sthibaul@sourceware.org>]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f987e9b7a3b98185b3398caaac0ebd24ef4cd358

commit f987e9b7a3b98185b3398caaac0ebd24ef4cd358
Author: Guy-Fleury Iteriteka <gfleury@disroot.org>
Date:   Sat Mar 18 11:58:25 2023 +0200

    htl: move ___pthread_self into libc.
    
    sysdeps/mach/hurd/htl/pt-pthread_self.c: New file.
    htl/Makefile: .. Add it to libc routine.
    sysdeps/mach/hurd/htl/pt-sysdep.c(__pthread_self): Remove it.
    sysdeps/mach/hurd/htl/pt-sysdep.h(__pthread_self): Add hidden propertie.
    htl/Versions(__pthread_self) Version it as private symbol.
    
    Signed-off-by: Guy-Fleury Iteriteka <gfleury@disroot.org>
    Message-Id: <20230318095826.1125734-3-gfleury@disroot.org>

Diff:
---
 htl/Makefile                            |  2 +-
 htl/Versions                            |  1 +
 sysdeps/mach/hurd/htl/pt-pthread_self.c | 22 ++++++++++++++++++++++
 sysdeps/mach/hurd/htl/pt-sysdep.c       |  2 --
 sysdeps/mach/hurd/htl/pt-sysdep.h       |  3 +++
 5 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/htl/Makefile b/htl/Makefile
index 9194c4fb85..622e85cef8 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -164,7 +164,7 @@ headers :=				\
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads
+routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads pt-pthread_self
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 113110f42e..9ec848119e 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-pthread_self.c b/sysdeps/mach/hurd/htl/pt-pthread_self.c
new file mode 100644
index 0000000000..c100471bc0
--- /dev/null
+++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c
@@ -0,0 +1,22 @@
+/* ___pthread_self variable.
+   Copyright (C) 2021-2023 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 0e8b537bdc..55b1a86e00 100644
--- a/sysdeps/mach/hurd/htl/pt-sysdep.c
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.c
@@ -26,8 +26,6 @@
 #include <pt-internal.h>
 #include <pthreadP.h>
 
-__thread struct __pthread *___pthread_self;
-
 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 bb32c28e01..d533450b11 100644
--- a/sysdeps/mach/hurd/htl/pt-sysdep.h
+++ b/sysdeps/mach/hurd/htl/pt-sysdep.h
@@ -19,6 +19,7 @@
 #ifndef _PT_SYSDEP_H
 #define _PT_SYSDEP_H	1
 
+#include <stddef.h>
 #include <mach.h>
 
 /* XXX */
@@ -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()                                            \
 	({                                                         \