diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-19 23:51:01 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-19 23:51:01 +0200 |
| commit | 94b7d08bf450ec00d135b3d835fc7493fd25c38e (patch) | |
| tree | 9f688ddaa979f8d823dac034e0774470786a0418 | |
| parent | 74509f87ae6e2ee8b87dec41c4e2d45fe2fae88f (diff) | |
| parent | 2929b22a0e00541bb0ea7fcf8e431cae64e32816 (diff) | |
Merge branch 't/tcbhead_t' into refs/top-bases/t/tls-threadvar
| -rw-r--r-- | sysdeps/mach/hurd/i386/tls.h | 34 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/tls.h | 21 |
2 files changed, 34 insertions, 21 deletions
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h index 3d717b29e2..77f456f080 100644 --- a/sysdeps/mach/hurd/i386/tls.h +++ b/sysdeps/mach/hurd/i386/tls.h @@ -23,6 +23,40 @@ /* 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. */ + int multiple_threads; + uintptr_t sysinfo; + uintptr_t stack_guard; + uintptr_t pointer_guard; + int gscope_flag; + int private_futex; + /* Reservation of some values for the TM ABI. */ + void *__private_tm[4]; + /* GCC split stack support. */ + void *__private_ss; +} 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 509035f251..5f3f8df053 100644 --- a/sysdeps/mach/hurd/tls.h +++ b/sysdeps/mach/hurd/tls.h @@ -29,27 +29,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) |