fix several locks that weren't updated right for new futex-based __lock
these could have caused memory corruption due to invalid accesses to
the next field. all should be fixed now; I found the errors with fgrep
-r '__lock(&', which is bogus since the argument should be an array.
diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h
index 0ce3c1e..46d8fdd 100644
--- a/src/internal/pthread_impl.h
+++ b/src/internal/pthread_impl.h
@@ -28,13 +28,12 @@
pid_t tid, pid;
int tsd_used, errno_val, *errno_ptr;
volatile int cancel, canceldisable, cancelasync;
+ int detached;
unsigned char *map_base;
size_t map_size;
void *start_arg;
void *(*start)(void *);
void *result;
- int detached;
- int exitlock;
struct __ptcb *cancelbuf;
void **tsd;
pthread_attr_t attr;
@@ -47,7 +46,8 @@
int unblock_cancel;
int delete_timer;
locale_t locale;
- int killlock;
+ int killlock[2];
+ int exitlock[2];
};
struct __timer {