diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-19 23:52:27 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-09-19 23:52:27 +0200 |
| commit | 9578dd6d7f42ee51fe578b914da77518279546c5 (patch) | |
| tree | cff2682a5573cb9c766154fafd62598047ebb681 | |
| parent | 3ffcd7418828f90cdfc11b0cb12b236daf8d08c4 (diff) | |
| parent | 49fb710ff3a8ff50d2f44116ce4f296e4f3afdeb (diff) | |
Merge commit 'refs/top-bases/t/pthread_functions' into t/pthread_functions
| -rw-r--r-- | sysdeps/mach/hurd/i386/tls.h | 38 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/tls.h | 25 |
2 files changed, 38 insertions, 25 deletions
diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h index f0113e8ce6..5b48239ce7 100644 --- a/sysdeps/mach/hurd/i386/tls.h +++ b/sysdeps/mach/hurd/i386/tls.h @@ -23,6 +23,44 @@ /* 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; + + /* Keep this field last */ + mach_port_t reply_port; /* This thread's reply port. */ + struct hurd_sigstate *_hurd_sigstate; +} 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 60fc6cb629..5f3f8df053 100644 --- a/sysdeps/mach/hurd/tls.h +++ b/sysdeps/mach/hurd/tls.h @@ -29,31 +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. */ - - /* Keep this field last */ - mach_port_t reply_port; /* This thread's reply port. */ - struct hurd_sigstate *_hurd_sigstate; -} tcbhead_t; - - /* This is the size of the initial TCB. */ # define TLS_INIT_TCB_SIZE sizeof (tcbhead_t) |