[PATCH 1/4] htl: move __pthread-total into libc.

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

* htl/Makefile(routine): add pt-total.
  htl/Versions(libc[PRIVATE]): add __pthread-total.
  htl/pt-create.c(__pthread-total): remove it
  htl/pt-total.c: New file.
  htl/pt-total.c(__pthread-total): move definition here.
  htl/pt-internal(__pthread-total): add to it libc_hidden_proto
                                    proprerty.
---
 htl/Makefile      |  2 +-
 htl/Versions      |  1 +
 htl/pt-create.c   |  6 ------
 htl/pt-internal.h |  1 +
 htl/pt-total.c    | 23 +++++++++++++++++++++++
 5 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 htl/pt-total.c

diff --git a/htl/Makefile b/htl/Makefile
index 0b403e2f..ad0e2645 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -164,7 +164,7 @@ headers :=				\
 
 distribute :=
 
-routines := forward libc_pthread_init alloca_cutoff htlfreeres
+routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-total
 shared-only-routines = forward
 
 extra-libs := libpthread
diff --git a/htl/Versions b/htl/Versions
index 4e0ebac2..113110f4 100644
--- a/htl/Versions
+++ b/htl/Versions
@@ -30,6 +30,7 @@ libc {
     __libc_alloca_cutoff;
     __libc_pthread_init;
     __pthread_cleanup_stack;
+    __pthread_total;
   }
 }
 
diff --git a/htl/pt-create.c b/htl/pt-create.c
index 5d37edbb..34a63b6a 100644
--- a/htl/pt-create.c
+++ b/htl/pt-create.c
@@ -36,12 +36,6 @@
 # include <locale.h>
 #endif
 
-/* The total number of pthreads currently active.  This is defined
-   here since it would be really stupid to have a threads-using
-   program that doesn't call `pthread_create'.  */
-unsigned int __pthread_total;
-\f
-
 /* The entry-point for new threads.  */
 static void
 entry_point (struct __pthread *self, void *(*start_routine) (void *), void *arg)
diff --git a/htl/pt-internal.h b/htl/pt-internal.h
index f01cb7ce..b787acf8 100644
--- a/htl/pt-internal.h
+++ b/htl/pt-internal.h
@@ -165,6 +165,7 @@ __pthread_dequeue (struct __pthread *thread)
 
 /* The total number of threads currently active.  */
 extern unsigned int __pthread_total;
+libc_hidden_proto (__pthread_total)
 
 /* Concurrency hint.  */
 extern int __pthread_concurrency;
diff --git a/htl/pt-total.c b/htl/pt-total.c
new file mode 100644
index 00000000..8188131c
--- /dev/null
+++ b/htl/pt-total.c
@@ -0,0 +1,23 @@
+/* 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-internal.h>
+
+/* Number of threads running.  */
+unsigned int __pthread_total;
+libc_hidden_data_def (__pthread_total)
-- 
2.37.2