[Glibc-bsd-commits] r5782 - in trunk/glibc-ports/fbtl/sysdeps: i386 x86_64

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 10:37:56 +0000 (Tue, 20 Oct 2015)
New Revision: 5782

Modified:
   trunk/glibc-ports/fbtl/sysdeps/i386/tls.h
   trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h
Log:
Merge from upstream:

commit 498a22333b835a598ccaed4656e97a0ec3573665
Author: Roland McGrath <roland at hack.frob.com>
Date:   Fri Mar 14 10:44:34 2014 -0700

    Compile with -Wundef.


Modified: trunk/glibc-ports/fbtl/sysdeps/i386/tls.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/i386/tls.h	2015-10-20 10:10:28 UTC (rev 5781)
+++ trunk/glibc-ports/fbtl/sysdeps/i386/tls.h	2015-10-20 10:37:56 UTC (rev 5782)
@@ -104,9 +104,6 @@
 };
 
 
-/* Get the thread descriptor definition.  */
-# include <fbtl/descr.h>
-
 /* This is the size of the initial TCB.  Can't be just sizeof (tcbhead_t),
    because NPTL getpid, __libc_alloca_cutoff etc. need (almost) the whole
    struct pthread even when not linked with -lpthread.  */
@@ -124,8 +121,12 @@
 /* The TCB can have any size and the memory following the address the
    thread pointer points to is unspecified.  Allocate the TCB there.  */
 # define TLS_TCB_AT_TP	1
+# define TLS_DTV_AT_TP  0
 
+/* Get the thread descriptor definition.  */
+# include <fbtl/descr.h>
 
+
 /* Install the dtv pointer.  The pointer passed is to the element with
    index -1 which contain the length.  */
 # define INSTALL_DTV(descr, dtvp) \

Modified: trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h	2015-10-20 10:10:28 UTC (rev 5781)
+++ trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h	2015-10-20 10:37:56 UTC (rev 5782)
@@ -93,9 +93,6 @@
 # include <sysdep.h>
 
 
-/* Get the thread descriptor definition.  */
-# include <fbtl/descr.h>
-
 #ifndef LOCK_PREFIX
 # ifdef UP
 #  define LOCK_PREFIX	/* nothing */
@@ -121,8 +118,12 @@
 /* The TCB can have any size and the memory following the address the
    thread pointer points to is unspecified.  Allocate the TCB there.  */
 # define TLS_TCB_AT_TP	1
+# define TLS_DTV_AT_TP  0
 
+/* Get the thread descriptor definition.  */
+# include <fbtl/descr.h>
 
+
 /* Install the dtv pointer.  The pointer passed is to the element with
    index -1 which contain the length.  */
 # define INSTALL_DTV(descr, dtvp) \