public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] hurd: Remove __hurd_threadvar_stack_{offset,mask}
@ 2023-04-02 23:27 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2023-04-02 23:27 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=71232da3b37b33d41c593c153a4a612067ff83cd
commit 71232da3b37b33d41c593c153a4a612067ff83cd
Author: Sergey Bugaev <bugaevc@gmail.com>
Date: Sun Mar 19 18:09:48 2023 +0300
hurd: Remove __hurd_threadvar_stack_{offset,mask}
Noone is or should be using __hurd_threadvar_stack_{offset,mask}, we
have proper TLS now. These two remaining variables are never set to
anything other than zero, so any code that would try to use them as
described would just dereference a zero pointer and crash. So remove
them entirely.
Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
Message-Id: <20230319151017.531737-6-bugaevc@gmail.com>
Diff:
---
hurd/Versions | 5 -----
hurd/hurd/threadvar.h | 15 ---------------
sysdeps/mach/hurd/Versions | 3 ---
sysdeps/mach/hurd/_Fork.c | 20 ++------------------
sysdeps/mach/hurd/i386/libc.abilist | 2 --
sysdeps/mach/hurd/x86/init-first.c | 3 ---
6 files changed, 2 insertions(+), 46 deletions(-)
diff --git a/hurd/Versions b/hurd/Versions
index 7e4f1c5630..3d8b412d49 100644
--- a/hurd/Versions
+++ b/hurd/Versions
@@ -1,8 +1,5 @@
libc {
GLIBC_2.0 {
- # variables used in macros & inline functions
- __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
-
# functions used in libmachuser and libhurduser
_S_catch_exception_raise;
_S_catch_exception_raise_state;
@@ -129,8 +126,6 @@ libc {
_hurd_fd_error_signal; _hurd_fd_error;
__hurd_dfail; __hurd_sockfail;
_hurd_port_locked_set;
- __hurd_threadvar_location_from_sp;
- __hurd_threadvar_location;
_hurd_userlink_link; _hurd_userlink_unlink; _hurd_userlink_clear;
}
GLIBC_2.29 {
diff --git a/hurd/hurd/threadvar.h b/hurd/hurd/threadvar.h
index 2a94f4de5b..f5c6a278a6 100644
--- a/hurd/hurd/threadvar.h
+++ b/hurd/hurd/threadvar.h
@@ -22,21 +22,6 @@
#include <features.h>
#include <tls.h>
-/* The per-thread variables are found by ANDing this mask
- with the value of the stack pointer and then adding this offset.
-
- In the multi-threaded case, cthreads initialization sets
- __hurd_threadvar_stack_mask to ~(cthread_stack_size - 1), a mask which
- finds the base of the fixed-size cthreads stack; and
- __hurd_threadvar_stack_offset to a small offset that skips the data
- cthreads itself maintains at the base of each thread's stack.
-
- In the single-threaded or libpthread case, __hurd_threadvar_stack_mask is
- zero, so the stack pointer is ignored. */
-
-extern unsigned long int __hurd_threadvar_stack_mask;
-extern unsigned long int __hurd_threadvar_stack_offset;
-
/* The variables __hurd_sigthread_stack_base and
__hurd_sigthread_stack_end define the bounds of the stack used by the
signal thread, so that thread can always be specifically identified. */
diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions
index d75e674bb6..bf2e870a2a 100644
--- a/sysdeps/mach/hurd/Versions
+++ b/sysdeps/mach/hurd/Versions
@@ -33,9 +33,6 @@ libc {
ld {
GLIBC_2.0 {
- # variables that must be shared with libc
- __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
-
# functions that must be shared with libc
__close; __getpid;
__mmap; __open; __read; __sbrk; __strtoul_internal;
diff --git a/sysdeps/mach/hurd/_Fork.c b/sysdeps/mach/hurd/_Fork.c
index 4984cecd0b..77cd29171e 100644
--- a/sysdeps/mach/hurd/_Fork.c
+++ b/sysdeps/mach/hurd/_Fork.c
@@ -482,25 +482,9 @@ retry:
(natural_t *) &state, &statecount))
LOSE;
#ifdef STACK_GROWTH_UP
- if (__hurd_sigthread_stack_base == 0)
- {
- state.SP &= __hurd_threadvar_stack_mask;
- state.SP += __hurd_threadvar_stack_offset;
- }
- else
- state.SP = __hurd_sigthread_stack_base;
+ state.SP = __hurd_sigthread_stack_base;
#else
- if (__hurd_sigthread_stack_end == 0)
- {
- /* The signal thread has a stack assigned by pthread.
- The threadvar_stack variables conveniently tell us how
- to get to the highest address in the stack, just below
- the per-thread variables. */
- state.SP &= __hurd_threadvar_stack_mask;
- state.SP += __hurd_threadvar_stack_offset;
- }
- else
- state.SP = __hurd_sigthread_stack_end;
+ state.SP = __hurd_sigthread_stack_end;
#endif
MACHINE_THREAD_STATE_SET_PC (&state,
(unsigned long int) _hurd_msgport_receive);
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index ed0c4789eb..da1cad6777 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -279,8 +279,6 @@ GLIBC_2.2.6 __gettimeofday F
GLIBC_2.2.6 __gmtime_r F
GLIBC_2.2.6 __h_errno_location F
GLIBC_2.2.6 __hurd_fail F
-GLIBC_2.2.6 __hurd_threadvar_stack_mask D 0x4
-GLIBC_2.2.6 __hurd_threadvar_stack_offset D 0x4
GLIBC_2.2.6 __isalnum_l F
GLIBC_2.2.6 __isalpha_l F
GLIBC_2.2.6 __isascii_l F
diff --git a/sysdeps/mach/hurd/x86/init-first.c b/sysdeps/mach/hurd/x86/init-first.c
index 75a5c842a9..6ca27155a4 100644
--- a/sysdeps/mach/hurd/x86/init-first.c
+++ b/sysdeps/mach/hurd/x86/init-first.c
@@ -34,9 +34,6 @@
extern void __mach_init (void);
extern void __init_misc (int, char **, char **);
-unsigned long int __hurd_threadvar_stack_offset;
-unsigned long int __hurd_threadvar_stack_mask;
-
extern int __libc_argc attribute_hidden;
extern char **__libc_argv attribute_hidden;
extern char **_dl_argv;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-02 23:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-02 23:27 [glibc] hurd: Remove __hurd_threadvar_stack_{offset,mask} Samuel Thibault
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).