about summary refs log tree commit diff
path: root/mach
diff options
context:
space:
mode:
Diffstat (limited to 'mach')
-rw-r--r--mach/Versions1
-rw-r--r--mach/mach.h3
-rw-r--r--mach/setup-thread.c29
3 files changed, 23 insertions, 10 deletions
diff --git a/mach/Versions b/mach/Versions
index 9cd2eee427..c7a3d60bae 100644
--- a/mach/Versions
+++ b/mach/Versions
@@ -32,6 +32,7 @@ libc {
     mach_port_allocate; mach_port_allocate_name; mach_port_deallocate;
     mach_port_insert_right; mach_reply_port;
     mach_setup_thread;
+    mach_setup_tls;
     mach_task_self;
     mach_thread_self;
     mig_allocate; mig_dealloc_reply_port; mig_deallocate;
diff --git a/mach/mach.h b/mach/mach.h
index 684be91cc3..93398b0da5 100644
--- a/mach/mach.h
+++ b/mach/mach.h
@@ -96,5 +96,8 @@ kern_return_t mach_setup_thread (task_t task, thread_t thread, void *pc,
 				 vm_address_t *stack_base,
 				 vm_size_t *stack_size);
 
+/* Give THREAD a TLS area.  */
+kern_return_t __mach_setup_tls (thread_t thread);
+kern_return_t mach_setup_tls (thread_t thread);
 
 #endif	/* mach.h */
diff --git a/mach/setup-thread.c b/mach/setup-thread.c
index 79ec4320b3..ce60a7302a 100644
--- a/mach/setup-thread.c
+++ b/mach/setup-thread.c
@@ -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)