X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Fpthread_impl.h;h=98d9b22d6f061bab335af1dbeaa65b9339def6ad;hp=03af4c120dc13d352b18a953818e5dfca00e3d21;hb=5a2e18093725c3965486641f0ad0b61a44f7ed68;hpb=dba68bf98fc708cea4c478278c889fc7ad802b00

diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 03af4c12..98d9b22d 100644
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -22,7 +22,6 @@
 
 struct pthread {
 	struct pthread *self;
-	unsigned long tlsdesc[4];
 	pid_t tid, pid;
 	int tsd_used, errno_val, *errno_ptr;
 	volatile uintptr_t cp_sp, cp_ip;
@@ -65,16 +64,22 @@ struct __timer {
 #define _m_prev __u.__p[3]
 #define _m_next __u.__p[4]
 #define _m_count __u.__i[5]
-#define _c_block __u.__i[0]
-#define _c_clock __u.__i[1]
-#define _rw_wrlock __u.__i[0]
-#define _rw_readers __u.__i[1]
-#define _rw_waiters __u.__i[2]
-#define _rw_owner __u.__i[3]
-#define _b_inst __u.__p[0]
+#define _c_mutex __u.__p[0]
+#define _c_seq __u.__i[2]
+#define _c_waiters __u.__i[3]
+#define _c_clock __u.__i[4]
+#define _c_lock __u.__i[5]
+#define _c_lockwait __u.__i[6]
+#define _c_waiters2 __u.__i[7]
+#define _c_destroy __u.__i[8]
+#define _rw_lock __u.__i[0]
+#define _rw_waiters __u.__i[1]
+#define _b_lock __u.__i[0]
+#define _b_waiters __u.__i[1]
 #define _b_limit __u.__i[2]
-#define _b_lock __u.__i[3]
-#define _b_waiters __u.__i[4]
+#define _b_count __u.__i[3]
+#define _b_waiters2 __u.__i[4]
+#define _b_inst __u.__p[4]
 
 #include "pthread_arch.h"
 
@@ -89,14 +94,14 @@ struct __timer {
 
 pthread_t __pthread_self_init(void);
 
+int __clone(int (*)(void *), void *, int, void *, ...);
 int __set_thread_area(void *);
 int __libc_sigaction(int, const struct sigaction *, struct sigaction *);
 int __libc_sigprocmask(int, const sigset_t *, sigset_t *);
 void __lock(volatile int *);
 void __unmapself(void *, size_t);
 
-int __timedwait(volatile int *, int, clockid_t, const struct timespec *, int);
-int __timedwait_cp(volatile int *, int, clockid_t, const struct timespec *, int);
+int __timedwait(volatile int *, int, clockid_t, const struct timespec *, void (*)(void *), void *, int);
 void __wait(volatile int *, volatile int *, int, int);
 void __wake(volatile int *, int, int);