diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/tls.h | 24 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/tls.h | 21 |
3 files changed, 30 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 970dedb45a..08e749db61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 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. 2014-04-16 Stefan Liebler <stli@linux.vnet.ibm.com> diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h index 845d53dbaf..e456b75921 100644 --- 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 dbe73f5035..3b8b713170 100644 --- 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) |