summaryrefslogtreecommitdiff
path: root/pthread/pt-create.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 01:53:45 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-03-19 01:53:45 +0100
commite708e2af80f403ba868d5cd095bd87913fc88c56 (patch)
tree8185944a8e3c145c0961c95f2cae8c4f23145ab5 /pthread/pt-create.c
parentddf59c36d90606ab0bfcdea99e1b01e98274eeb0 (diff)
Remove ENABLE_TLS define
* Makefile (CPPFLAGS): Remove -DENABLE_TLS. * pthread/pt-alloc.c: Remove ENABLE_TLS condition. * pthread/pt-create.c: Likewise. * pthread/pt-internal.h: Likewise.
Diffstat (limited to 'pthread/pt-create.c')
-rw-r--r--pthread/pt-create.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/pthread/pt-create.c b/pthread/pt-create.c
index cf226cc..41e8507 100644
--- a/pthread/pt-create.c
+++ b/pthread/pt-create.c
@@ -44,10 +44,8 @@ unsigned int __pthread_total;
static void
entry_point (struct __pthread *self, void *(*start_routine)(void *), void *arg)
{
-#ifdef ENABLE_TLS
___pthread_self = self;
__resp = &self->res_state;
-#endif
#if IS_IN (libpthread)
/* Initialize pointers to locale data. */
@@ -147,7 +145,6 @@ __pthread_create_internal (struct __pthread **thread,
if (err)
goto failed_thread_alloc;
-#ifdef ENABLE_TLS
pthread->tcb = _dl_allocate_tls (NULL);
if (!pthread->tcb)
{
@@ -155,7 +152,6 @@ __pthread_create_internal (struct __pthread **thread,
goto failed_thread_tls_alloc;
}
pthread->tcb->tcb = pthread->tcb;
-#endif /* ENABLE_TLS */
/* And initialize the rest of the machine context. This may include
additional machine- and system-specific initializations that
@@ -230,11 +226,9 @@ __pthread_create_internal (struct __pthread **thread,
failed_sigstate:
__pthread_sigstate_destroy (pthread);
failed_setup:
-#ifdef ENABLE_TLS
_dl_deallocate_tls (pthread->tcb, 1);
pthread->tcb = NULL;
failed_thread_tls_alloc:
-#endif /* ENABLE_TLS */
__pthread_thread_terminate (pthread);
/* __pthread_thread_terminate has taken care of deallocating the stack and