From: Guy-Fleury Iteriteka <gfleury@disroot.org>
To: libc-alpha@sourceware.org
Cc: bug-hurd@gnu.org
Subject: [PATCH 2/3] htl: move ___pthread_self into libc.
Date: Tue, 3 Jan 2023 12:45:14 +0200 [thread overview]
Message-ID: <20230103104515.324527-3-gfleury@disroot.org> (raw)
In-Reply-To: <20230103104515.324527-1-gfleury@disroot.org>
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.
---
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(-)
create mode 100644 sysdeps/mach/hurd/htl/pt-pthread_self.c
diff --git a/htl/Makefile b/htl/Makefile
index 61944148..b569cfcd 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 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-pthread_self.c b/sysdeps/mach/hurd/htl/pt-pthread_self.c
new file mode 100644
index 00000000..6398af65
--- /dev/null
+++ b/sysdeps/mach/hurd/htl/pt-pthread_self.c
@@ -0,0 +1,22 @@
+/* Thread counter 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 2d828545..4cd6ba3a 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 854c365c..94d77678 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() \
({ \
--
2.38.1
next prev parent reply other threads:[~2023-01-03 10:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 10:45 [PATCH 0/3] htl: move __pthtread_total, ___pthread_self, pthread_self Guy-Fleury Iteriteka
2023-01-03 10:45 ` [PATCH 1/3] htl: move __pthtread_total into libc Guy-Fleury Iteriteka
2023-01-03 10:45 ` Guy-Fleury Iteriteka [this message]
2023-01-03 10:45 ` [PATCH 3/3] htl: move pthread_self " Guy-Fleury Iteriteka
2023-01-03 21:50 ` Samuel Thibault
2023-01-03 23:02 ` Samuel Thibault
2023-01-03 17:22 ` [PATCH 0/3] htl: move __pthtread_total, ___pthread_self, pthread_self Zack Weinberg
2023-01-03 18:28 ` Samuel Thibault
2023-01-09 21:59 ` Zack Weinberg
2023-01-03 18:30 ` Guy-Fleury Iteriteka
2023-01-03 21:50 ` Samuel Thibault
2023-01-04 8:49 ` gfleury
2023-03-18 9:58 [PATCH 0/3] htl: move some symbol into libc Guy-Fleury Iteriteka
2023-03-18 9:58 ` [PATCH 2/3] htl: move ___pthread_self " Guy-Fleury Iteriteka
2023-04-04 23:27 ` Samuel Thibault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230103104515.324527-3-gfleury@disroot.org \
--to=gfleury@disroot.org \
--cc=bug-hurd@gnu.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).