diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-08-01 00:10:03 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-08-01 00:10:03 +0200 |
| commit | 42fc12ef7345855ed6e2f23f863a16f43c2a8078 (patch) | |
| tree | 2db81f345f73ecdfb94bba9936a9dd0661b40bc8 /sysdeps/mach/hurd | |
| parent | d4b54bdff0064c36097dd5468f8aca9257472e9a (diff) | |
hurd: Fix exec usage of mach_setup_thread
Exec needs that mach_setup_thread does *not* set up TLS since it works on
another task, so we have to split this into mach_setup_tls.
* mach/mach.h (__mach_setup_tls, mach_setup_tls): Add prototypes.
* mach/setup-thread.c (__mach_setup_thread): Move TLS setup to...
(__mach_setup_tls): ... new function.
(mach_setup_tls): New alias.
* hurd/hurdsig.c (_hurdsig_init): Call __mach_setup_tls after
__mach_setup_thread.
* sysdeps/mach/hurd/profil.c (update_waiter): Likewise.
* sysdeps/mach/hurd/setitimer.c (setitimer_locked): Likewise.
* mach/Versions [libc] (mach_setup_tls): Add symbol.
* sysdeps/mach/hurd/i386/libc.abilist (mach_setup_tls): Likewise.
Diffstat (limited to 'sysdeps/mach/hurd')
| -rw-r--r-- | sysdeps/mach/hurd/i386/libc.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/profil.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/setitimer.c | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 64586d828d..e3fc05137b 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -1228,6 +1228,7 @@ GLIBC_2.2.6 mach_port_deallocate F GLIBC_2.2.6 mach_port_insert_right F GLIBC_2.2.6 mach_reply_port F GLIBC_2.2.6 mach_setup_thread F +GLIBC_2.2.6 mach_setup_tls F GLIBC_2.2.6 mach_task_self F GLIBC_2.2.6 mach_thread_self F GLIBC_2.2.6 madvise F diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c index 952398b4fa..c2c2f9f119 100644 --- a/sysdeps/mach/hurd/profil.c +++ b/sysdeps/mach/hurd/profil.c @@ -70,6 +70,8 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale) if (! err) err = __mach_setup_thread (__mach_task_self (), profile_thread, &profile_waiter, NULL, NULL); + if (! err) + err = __mach_setup_tls(profile_thread); } else err = 0; diff --git a/sysdeps/mach/hurd/setitimer.c b/sysdeps/mach/hurd/setitimer.c index a0d294162b..f5dfb7da84 100644 --- a/sysdeps/mach/hurd/setitimer.c +++ b/sysdeps/mach/hurd/setitimer.c @@ -221,11 +221,12 @@ setitimer_locked (const struct itimerval *new, struct itimerval *old, goto out; _hurd_itimer_thread_stack_base = 0; /* Anywhere. */ _hurd_itimer_thread_stack_size = __vm_page_size; /* Small stack. */ - if (err = __mach_setup_thread (__mach_task_self (), + if ((err = __mach_setup_thread (__mach_task_self (), _hurd_itimer_thread, &timer_thread, &_hurd_itimer_thread_stack_base, &_hurd_itimer_thread_stack_size)) + || (err = __mach_setup_tls(_hurd_itimer_thread))) { __thread_terminate (_hurd_itimer_thread); _hurd_itimer_thread = MACH_PORT_NULL; |