From 8b6785f0836011cace9a77f3c24e51a7379238a0 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 5 Feb 2014 21:21:00 +1000 Subject: Revert "Patch 3/4 of the effort to make TLS access async-signal-safe." This reverts commit 35e8f7ab94c910659de9d507aa0f3e1f8973d914. --- nptl/allocatestack.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'nptl/allocatestack.c') 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)); -- cgit v1.2.3