diff options
| author | Allan McRae <allan@archlinux.org> | 2014-02-05 21:21:00 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-02-06 08:46:20 +1000 |
| commit | 8b6785f0836011cace9a77f3c24e51a7379238a0 (patch) | |
| tree | ad74c6bc2f68916c614ee907665245e306da5292 /nptl | |
| parent | dd654bf9ba1848bf9ed250f8ebaa5097c383dcf8 (diff) | |
Revert "Patch 3/4 of the effort to make TLS access async-signal-safe."
This reverts commit 35e8f7ab94c910659de9d507aa0f3e1f8973d914.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/allocatestack.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index 7f6094ebb2..13eca47cf2 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -242,7 +242,11 @@ get_cached_stack (size_t *sizep, void **memp) /* Clear the DTV. */ dtv_t *dtv = GET_DTV (TLS_TPADJ (result)); - _dl_clear_dtv (dtv); + for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt) + if (! dtv[1 + cnt].pointer.is_static + && dtv[1 + cnt].pointer.val != TLS_DTV_UNALLOCATED) + free (dtv[1 + cnt].pointer.val); + memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t)); /* Re-initialize the TLS. */ _dl_allocate_tls_init (TLS_TPADJ (result)); |