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

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2016-07-06 16:24:54 +0000 (Wed, 06 Jul 2016)
New Revision: 6078

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

commit aca1daef298b43bd7b1987b31f5aabcf6c2f6021
Author: Florian Weimer <fweimer at redhat.com>
Date:   Mon Jun 20 14:31:40 2016 +0200

    elf: Consolidate machine-agnostic DTV definitions in <dl-dtv.h>
    
    Identical definitions of dtv_t and TLS_DTV_UNALLOCATED were
    repeated for all architectures using DTVs.



Modified: trunk/glibc-ports-2.24/fbtl/sysdeps/i386/tls.h
===================================================================
--- trunk/glibc-ports-2.24/fbtl/sysdeps/i386/tls.h	2016-07-06 16:23:34 UTC (rev 6077)
+++ trunk/glibc-ports-2.24/fbtl/sysdeps/i386/tls.h	2016-07-06 16:24:54 UTC (rev 6078)
@@ -28,20 +28,8 @@
 # include <sysdep.h>
 # include <libc-internal.h>
 # include <kernel-features.h>
+# include <dl-dtv.h>
 
-
-/* Type for the dtv.  */
-typedef union dtv
-{
-  size_t counter;
-  struct
-  {
-    void *val;
-    bool is_static;
-  } pointer;
-} dtv_t;
-
-
 typedef struct
 {
   void *tcb;		/* Pointer to the TCB.  Not necessarily the

Modified: trunk/glibc-ports-2.24/fbtl/sysdeps/x86_64/tls.h
===================================================================
--- trunk/glibc-ports-2.24/fbtl/sysdeps/x86_64/tls.h	2016-07-06 16:23:34 UTC (rev 6077)
+++ trunk/glibc-ports-2.24/fbtl/sysdeps/x86_64/tls.h	2016-07-06 16:24:54 UTC (rev 6078)
@@ -28,6 +28,7 @@
 # include <sysdep.h>
 # include <libc-internal.h>
 # include <kernel-features.h>
+# include <dl-dtv.h>
 
 /* Replacement type for __m128 since this file is included by ld.so,
    which is compiled with -mno-sse.  It must not change the alignment
@@ -38,18 +39,7 @@
 } __128bits;
 
 
-/* Type for the dtv.  */
-typedef union dtv
-{
-  size_t counter;
-  struct
-  {
-    void *val;
-    bool is_static;
-  } pointer;
-} dtv_t;
 
-
 typedef struct
 {
   void *tcb;		/* Pointer to the TCB.  Not necessarily the