X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Fpthread_impl.h;h=7c352bc42c14df5efc600c1f1432022fcdfd7b34;hb=4e98cce1c529a304d7b55b5455078b9532f93e9b;hp=7e7baa9051e6183a1b49d7f0e0e6ba9d13b62b53;hpb=0fc317d83c1167393bf276a8bfbdd9a4e02e8258;p=musl diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h index 7e7baa90..7c352bc4 100644 --- a/src/internal/pthread_impl.h +++ b/src/internal/pthread_impl.h @@ -38,13 +38,14 @@ struct pthread { volatile void *volatile pending; } robust_list; int unblock_cancel; - int timer_id; + volatile int timer_id; locale_t locale; - int killlock[2]; - int exitlock[2]; - int startlock[2]; + volatile int killlock[2]; + volatile int exitlock[2]; + volatile int startlock[2]; unsigned long sigmask[_NSIG/8/sizeof(long)]; void *stdio_locks; + void **dtv_copy; }; struct __timer { @@ -62,26 +63,26 @@ struct __timer { #define _a_policy __u.__i[3*__SU+2] #define _a_prio __u.__i[3*__SU+3] #define _m_type __u.__i[0] -#define _m_lock __u.__i[1] -#define _m_waiters __u.__i[2] +#define _m_lock __u.__vi[1] +#define _m_waiters __u.__vi[2] #define _m_prev __u.__p[3] #define _m_next __u.__p[4] #define _m_count __u.__i[5] #define _c_shared __u.__p[0] -#define _c_seq __u.__i[2] -#define _c_waiters __u.__i[3] +#define _c_seq __u.__vi[2] +#define _c_waiters __u.__vi[3] #define _c_clock __u.__i[4] -#define _c_lock __u.__i[8] +#define _c_lock __u.__vi[8] #define _c_head __u.__p[1] #define _c_tail __u.__p[5] -#define _rw_lock __u.__i[0] -#define _rw_waiters __u.__i[1] +#define _rw_lock __u.__vi[0] +#define _rw_waiters __u.__vi[1] #define _rw_shared __u.__i[2] -#define _b_lock __u.__i[0] -#define _b_waiters __u.__i[1] +#define _b_lock __u.__vi[0] +#define _b_waiters __u.__vi[1] #define _b_limit __u.__i[2] -#define _b_count __u.__i[3] -#define _b_waiters2 __u.__i[4] +#define _b_count __u.__vi[3] +#define _b_waiters2 __u.__vi[4] #define _b_inst __u.__p[3] #include "pthread_arch.h"