hurd: Move dtv, dtv_t, tcbhead_t declaration to per-arch file.

diff --git a/ChangeLog b/ChangeLog
index 970dedb45a9329306d313327b8d7eb69b34a7e90..08e749db61ced165f882187a62caf8d745490d11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-16  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+       * sysdeps/mach/hurd/tls.h (dtv, dtv_t, tcbhead_t): Move declarations
+       to...
+       * sysdeps/mach/hurd/i386/tls.h: ... here.
+
 2014-04-16  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * sysdeps/mach/munmap.c (__munmap): Return EINVAL if `addr' is 0.

diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h
index 845d53dbaf513434b02ac16d205d85f990bc794d..e456b7592170347cf14076dd793840b30ebe4384 100644 (file)
--- a/sysdeps/mach/hurd/i386/tls.h
+++ b/sysdeps/mach/hurd/i386/tls.h
@@ -23,6 +23,30 @@
 /* Some things really need not be machine-dependent.  */
 #include <sysdeps/mach/hurd/tls.h>
 
+
+#ifndef __ASSEMBLER__
+/* Type for the dtv.  */
+typedef union dtv
+{
+  size_t counter;
+  struct
+  {
+    void *val;
+    bool is_static;
+  } pointer;
+} dtv_t;
+
+
+/* Type of the TCB.  */
+typedef struct
+{
+  void *tcb;                   /* Points to this structure.  */
+  dtv_t *dtv;                  /* Vector of pointers to TLS data.  */
+  thread_t self;               /* This thread's control port.  */
+} tcbhead_t;
+#endif
+
+
 /* 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

diff --git a/sysdeps/mach/hurd/tls.h b/sysdeps/mach/hurd/tls.h
index dbe73f50355d1f67ac8d09f3b1674ce337e78fe3..3b8b713170b14f42eecfce8ed9150645ae320ed4 100644 (file)
--- a/sysdeps/mach/hurd/tls.h
+++ b/sysdeps/mach/hurd/tls.h
@@ -27,27 +27,6 @@
 # include <mach.h>
 
 
-/* Type for the dtv.  */
-typedef union dtv
-{
-  size_t counter;
-  struct
-  {
-    void *val;
-    bool is_static;
-  } pointer;
-} dtv_t;
-
-
-/* Type of the TCB.  */
-typedef struct
-{
-  void *tcb;                   /* Points to this structure.  */
-  dtv_t *dtv;                  /* Vector of pointers to TLS data.  */
-  thread_t self;               /* This thread's control port.  */
-} tcbhead_t;
-
-
 /* This is the size of the initial TCB.  */
 # define TLS_INIT_TCB_SIZE sizeof (tcbhead_t)