[Glibc-bsd-commits] r6155 - trunk/glibc-ports-2.25/fbtl

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2017-08-04 01:42:12 +0000 (Fri, 04 Aug 2017)
New Revision: 6155

Modified:
   trunk/glibc-ports-2.25/fbtl/allocatestack.c
Log:
allocatestack.c (get_cached_stack): Free to_free member of struct dtv_pointer instead of val

upstream commit a2ff21f825adb8821eeb6145197fa8b9a8a60a58: elf: Avoid using memalign for TLS allocations [BZ #17730]


Modified: trunk/glibc-ports-2.25/fbtl/allocatestack.c
===================================================================
--- trunk/glibc-ports-2.25/fbtl/allocatestack.c	2017-08-04 01:19:28 UTC (rev 6154)
+++ trunk/glibc-ports-2.25/fbtl/allocatestack.c	2017-08-04 01:42:12 UTC (rev 6155)
@@ -254,9 +254,7 @@
   /* Clear the DTV.  */
   dtv_t *dtv = GET_DTV (TLS_TPADJ (result));
   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);
+    free (dtv[1 + cnt].pointer.to_free);
   memset (dtv, '\0', (dtv[-1].counter + 1) * sizeof (dtv_t));
 
   /* Re-initialize the TLS.  */