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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2017-08-04 01:19:28 +0000 (Fri, 04 Aug 2017)
New Revision: 6154

Modified:
   trunk/glibc-ports-2.25/fbtl/nptl-init.c
Log:
nptl-init.c: Do not call __libc_setup_tls

upstream commit 003a27e8195470f470f4d9384ca70d4e9fc8bd1b: Initialize the stack guard earlier when linking statically [BZ #7065]



Modified: trunk/glibc-ports-2.25/fbtl/nptl-init.c
===================================================================
--- trunk/glibc-ports-2.25/fbtl/nptl-init.c	2017-08-03 22:28:43 UTC (rev 6153)
+++ trunk/glibc-ports-2.25/fbtl/nptl-init.c	2017-08-04 01:19:28 UTC (rev 6154)
@@ -68,10 +68,6 @@
 static const char nptl_version[] __attribute_used__ = VERSION;
 
 
-#ifndef SHARED
-extern void __libc_setup_tls (size_t tcbsize, size_t tcbalign);
-#endif
-
 #ifdef SHARED
 static
 #else
@@ -290,18 +286,6 @@
 void
 __pthread_initialize_minimal_internal (void)
 {
-#ifndef SHARED
-  /* Unlike in the dynamically linked case the dynamic linker has not
-     taken care of initializing the TLS data structures.  */
-  __libc_setup_tls (TLS_TCB_SIZE, TLS_TCB_ALIGN);
-
-  /* We must prevent gcc from being clever and move any of the
-     following code ahead of the __libc_setup_tls call.  This function
-     will initialize the thread register which is subsequently
-     used.  */
-  __asm __volatile ("");
-#endif
-
   /* Minimal initialization of the thread descriptor.  */
   struct pthread *pd = THREAD_SELF;
 #if 1