diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/htl/pt-key-create.c | 1 | ||||
| -rw-r--r-- | sysdeps/htl/pt-key.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sysdeps/htl/pt-key-create.c b/sysdeps/htl/pt-key-create.c index ca4908c55c..f8dc5ac0c5 100644 --- a/sysdeps/htl/pt-key-create.c +++ b/sysdeps/htl/pt-key-create.c @@ -24,6 +24,7 @@ #include <pthreadP.h> pthread_mutex_t __pthread_key_lock; +pthread_once_t __pthread_key_once = PTHREAD_ONCE_INIT; void (**__pthread_key_destructors) (void *arg); int __pthread_key_size; diff --git a/sysdeps/htl/pt-key.h b/sysdeps/htl/pt-key.h index 34c12d51ab..ef652ecc6f 100644 --- a/sysdeps/htl/pt-key.h +++ b/sysdeps/htl/pt-key.h @@ -47,14 +47,15 @@ extern int __pthread_key_invalid_count; /* Protects the above variables. This must be a recursive lock: the destructors may call pthread_key_delete. */ extern pthread_mutex_t __pthread_key_lock; + +/* Protects the initialization of the mutex above. */ +extern pthread_once_t __pthread_key_once; #include <assert.h> static inline void __pthread_key_lock_ready (void) { - static pthread_once_t o = PTHREAD_ONCE_INIT; - void do_init (void) { int err; @@ -73,5 +74,5 @@ __pthread_key_lock_ready (void) assert_perror (err); } - __pthread_once (&o, do_init); + __pthread_once (&__pthread_key_once, do_init); } |