diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:04:43 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2011-10-20 17:07:46 +0200 |
| commit | 221b60d8f0cf39511d26e275b3a0e26a4bdc4f15 (patch) | |
| tree | 3709e6de0bce10163a85421fc2376fe35863c312 /pthread/pt-exit.c | |
| parent | 33d3344be6ab376cc73f12c8355a262cb3057021 (diff) | |
| parent | 1b37ff3740644d3febf6ae6e7f756a8d152a37e6 (diff) | |
Merge branch 'tls'
Conflicts:
ChangeLog
Makefile
pthread/pt-exit.c
pthread/pt-internal.h
sysdeps/mach/hurd/ia32/pt-setup.c
sysdeps/mach/hurd/pt-docancel.c
sysdeps/mach/hurd/pt-sysdep.h
Diffstat (limited to 'pthread/pt-exit.c')
| -rw-r--r-- | pthread/pt-exit.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index 3b3853e3..c01efda0 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -1,5 +1,5 @@ /* Thread termination. - Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2005, 2007, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -69,6 +69,11 @@ pthread_exit (void *status) if (self->cancel_state == PTHREAD_CANCEL_ENABLE && self->cancel_pending) status = PTHREAD_CANCELED; +#ifdef ENABLE_TLS + if (self->tcb) + _dl_deallocate_tls (self->tcb, 1); +#endif /* ENABLE_TLS */ + switch (self->state) { default: |