From c8538dfe4032c398974e46edef97cac03a9f185f Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 31 Aug 2012 00:04:26 +0200 Subject: Revert "Store self in __thread variable instead of threadvar" This reverts commit 25260994c812050a5d7addf125cdc90c911ca5c1. Conflicts: sysdeps/l4/hurd/ia32/pt-setup.c sysdeps/l4/hurd/powerpc/pt-setup.c --- pthread/pt-create.c | 6 +----- pthread/pt-internal.h | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'pthread') diff --git a/pthread/pt-create.c b/pthread/pt-create.c index 4d81a95..ca6b66c 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -38,12 +38,8 @@ __atomic_t __pthread_total; /* The entry-point for new threads. */ static void -entry_point (struct __pthread *self, void *(*start_routine)(void *), void *arg) +entry_point (void *(*start_routine)(void *), void *arg) { -#ifdef ENABLE_TLS - ___pthread_self = self; -#endif - #ifdef HAVE_USELOCALE /* A fresh thread needs to be bound to the global locale. */ uselocale (LC_GLOBAL_LOCALE); diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index 067fb73..2a21744 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -219,8 +219,7 @@ extern void __pthread_stack_dealloc (void *stackaddr, size_t stacksize); /* Setup thread THREAD's context. */ extern int __pthread_setup (struct __pthread *__restrict thread, - void (*entry_point)(struct __pthread *, - void *(*)(void *), + void (*entry_point)(void *(*)(void *), void *), void *(*start_routine)(void *), void *__restrict arg); -- cgit v1.2.3