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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-03-20 00:14:33 +0000 (Sun, 20 Mar 2016)
New Revision: 5953

Modified:
   trunk/glibc-ports-2.23/fbtl/sysdeps/i386/tls.h
   trunk/glibc-ports-2.23/fbtl/sysdeps/x86_64/tls.h
Log:
Merge from upstream:
commit d1d9eaf478b7d3a11a599c120498b79fe5629a61
Author: Ond?\197?\153ej B?\195?\173lka <neleai at seznam.cz>
Date:   Tue Nov 26 12:29:20 2013 +0100

    Use __glibc_reserved instead __unused.



Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/i386/tls.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/i386/tls.h	2016-03-20 00:13:31 UTC (rev 5952)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/i386/tls.h	2016-03-20 00:14:33 UTC (rev 5953)
@@ -56,7 +56,7 @@
 #ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 #else
-  int __unused1;
+  int __glibc_reserved1;_
 #endif
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];

Modified: trunk/glibc-ports-2.23/fbtl/sysdeps/x86_64/tls.h
===================================================================
--- trunk/glibc-ports-2.23/fbtl/sysdeps/x86_64/tls.h	2016-03-20 00:13:31 UTC (rev 5952)
+++ trunk/glibc-ports-2.23/fbtl/sysdeps/x86_64/tls.h	2016-03-20 00:14:33 UTC (rev 5953)
@@ -65,14 +65,14 @@
 # ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 # else
-  int __unused1;
+  int __glibc_reserved1; 
 # endif
   int __glibc_unused1; 
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[4];
   /* GCC split stack support.  */
   void *__private_ss;
-  long int __unused2;
+  long int __glibc_reserved2;
   /* Must be kept even if it is no longer used by glibc since programs,
      like AddressSanitizer, depend on the size of tcbhead_t.  */
   __128bits __glibc_unused2[8][4] __attribute__ ((aligned (32)));