diff options
| author | Sergey Bugaev <bugaevc@gmail.com> | 2023-03-19 18:09:48 +0300 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-04-03 00:53:25 +0200 |
| commit | 71232da3b37b33d41c593c153a4a612067ff83cd (patch) | |
| tree | dac7dcb4104773cf1f38b67f01aa10271d9f867b /sysdeps/mach/hurd | |
| parent | d8ee5d614bc485f6d1752dfa0d60524b20945a56 (diff) | |
| download | glibc-71232da3b37b33d41c593c153a4a612067ff83cd.zip glibc-71232da3b37b33d41c593c153a4a612067ff83cd.tar.gz glibc-71232da3b37b33d41c593c153a4a612067ff83cd.tar.bz2 | |
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>
Diffstat (limited to 'sysdeps/mach/hurd')
| -rw-r--r-- | sysdeps/mach/hurd/Versions | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/_Fork.c | 20 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/libc.abilist | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/x86/init-first.c | 3 |
4 files changed, 2 insertions, 26 deletions
diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions index d75e674..bf2e870 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 4984cec..77cd291 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 ed0c478..da1cad6 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 75a5c84..6ca2715 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; |