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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-10-20 10:47:48 +0000 (Tue, 20 Oct 2015)
New Revision: 5783

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

commit 774f928582fcfefb726f115772c001043aefa01c
Author: Andreas Schwab <schwab at suse.de>
Date:   Tue May 13 16:40:41 2014 +0200

    Remove second argument from TLS_INIT_TP macro



Modified: trunk/glibc-ports/fbtl/sysdeps/i386/tls.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/i386/tls.h	2015-10-20 10:37:56 UTC (rev 5782)
+++ trunk/glibc-ports/fbtl/sysdeps/i386/tls.h	2015-10-20 10:47:48 UTC (rev 5783)
@@ -195,7 +195,7 @@
 /* Code to initially initialize the thread pointer.  This might need
    special attention since 'errno' is not yet available and if the
    operation can cause a failure 'errno' must not be touched.  */
-# define TLS_INIT_TP(thrdescr, secondcall) \
+# define TLS_INIT_TP(thrdescr) \
   ({ void *_thrdescr = (thrdescr);					      \
      tcbhead_t *_head = _thrdescr;					      \
      union user_desc_init _segdescr;					      \
@@ -208,10 +208,7 @@
      INIT_SYSINFO;							      \
 									      \
      /* The 'entry_number' field.  Let the kernel pick a value.  */	      \
-     if (secondcall)							      \
-       _segdescr.vals[0] = TLS_GET_GS () >> 3;				      \
-     else								      \
-       _segdescr.vals[0] = -1;						      \
+     _segdescr.vals[0] = -1;						      \
      /* The 'base_addr' field.  Pointer to the TCB.  */			      \
      _segdescr.vals[1] = (unsigned long int) _thrdescr;			      \
      /* The 'limit' field.  We use 4GB which is 0xfffff pages.  */	      \

Modified: trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h
===================================================================
--- trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h	2015-10-20 10:37:56 UTC (rev 5782)
+++ trunk/glibc-ports/fbtl/sysdeps/x86_64/tls.h	2015-10-20 10:47:48 UTC (rev 5783)
@@ -145,7 +145,7 @@
 
    We have to make the syscall for both uses of the macro since the
    address might be (and probably is) different.  */
-# define TLS_INIT_TP(thrdescr, secondcall) \
+# define TLS_INIT_TP(thrdescr) \
   ({ void *_thrdescr = (thrdescr);					      \
      tcbhead_t *_head = _thrdescr;					      \
      int _result;							      \

Modified: trunk/glibc-ports/kfreebsd/i386/fbtl/tls.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/fbtl/tls.h	2015-10-20 10:37:56 UTC (rev 5782)
+++ trunk/glibc-ports/kfreebsd/i386/fbtl/tls.h	2015-10-20 10:47:48 UTC (rev 5783)
@@ -64,7 +64,7 @@
 
 /*   The value of this macro is null if successful, or an error string.  */
 
-#  define TLS_INIT_TP(descr, secondcall)				      \
+#  define TLS_INIT_TP(descr)						      \
   ({									      \
     void *_descr = (descr);						      \
     tcbhead_t *head = _descr;						      \

Modified: trunk/glibc-ports/kfreebsd/x86_64/fbtl/tls.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/fbtl/tls.h	2015-10-20 10:37:56 UTC (rev 5782)
+++ trunk/glibc-ports/kfreebsd/x86_64/fbtl/tls.h	2015-10-20 10:47:48 UTC (rev 5783)
@@ -45,7 +45,7 @@
    operation can cause a failure 'errno' must not be touched.  */
 
 # undef TLS_INIT_TP
-# define TLS_INIT_TP(descr, secondcall)					      \
+# define TLS_INIT_TP(descr)						      \
   ({									      \
     void *_descr = (descr);						      \
     tcbhead_t *head = _descr;						      \