lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

hurd: Fix exec usage of mach_setup_thread

Browse Source 
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.
This commit is contained in:
Samuel Thibault
2018-08-01 00:10:03 +02:00
parent d4b54bdff0
commit 42fc12ef73
8 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mach/setup-thread.c
View File

@ -42,7 +42,6 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc,
vm_address_t stack;
vm_size_t size;
int anywhere;
tcbhead_t *tcb;
size = stack_size ? *stack_size ? : STACK_SIZE : STACK_SIZE;
stack = stack_base ? *stack_base ? : 0 : 0;
@ -52,10 +51,6 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc,
if (error)
return error;
tcb = _dl_allocate_tls (NULL);
if (tcb == NULL)
return KERN_RESOURCE_SHORTAGE;
if (stack_size)
*stack_size = size;
@ -78,9 +73,24 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc,
if (error = __vm_protect (task, stack, __vm_page_size, 0, VM_PROT_NONE))
return error;
if (error = __thread_set_state (thread, MACHINE_NEW_THREAD_STATE_FLAVOR,
(natural_t *) &ts, tssize))
return error;
return __thread_set_state (thread, MACHINE_NEW_THREAD_STATE_FLAVOR,
(natural_t *) &ts, tssize);
}
weak_alias (__mach_setup_thread, mach_setup_thread)
/* Give THREAD a TLS area. */
kern_return_t
__mach_setup_tls (thread_t thread)
{
kern_return_t error;
struct machine_thread_state ts;
mach_msg_type_number_t tssize = MACHINE_THREAD_STATE_COUNT;
tcbhead_t *tcb;
tcb = _dl_allocate_tls (NULL);
if (tcb == NULL)
return KERN_RESOURCE_SHORTAGE;
if (error = __thread_get_state (thread, MACHINE_THREAD_STATE_FLAVOR,
(natural_t *) &ts, &tssize))
@ -91,8 +101,7 @@ __mach_setup_thread (task_t task, thread_t thread, void *pc,
error = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR,
(natural_t *) &ts, tssize);
return error;
}
weak_alias (__mach_setup_thread, mach_setup_thread)
weak_alias (__mach_setup_tls, mach_setup_tls)