re-enable vdso clock_gettime on arm (32-bit) with workaround

[musl] / src / thread / pthread_key_create.c

diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index dc20cc3..d112094 100644 (file)
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -22,7 +22,6 @@ weak_alias(dummy_0, __tl_unlock);
 
 int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
 {
-       pthread_key_t j = next_key;
        pthread_t self = __pthread_self();
 
        /* This can only happen in the main thread before
@@ -33,6 +32,7 @@ int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
        if (!dtor) dtor = nodtor;
 
        __pthread_rwlock_wrlock(&key_lock);
+       pthread_key_t j = next_key;
        do {
                if (!keys[j]) {
                        keys[next_key = *k = j] = dtor;
@@ -51,15 +51,17 @@ int __pthread_key_delete(pthread_key_t k)
        pthread_t self = __pthread_self(), td=self;
 
        __block_app_sigs(&set);
+       __pthread_rwlock_wrlock(&key_lock);
+
        __tl_lock();
        do td->tsd[k] = 0;
        while ((td=td->next)!=self);
        __tl_unlock();
-       __restore_sigs(&set);
 
-       __pthread_rwlock_wrlock(&key_lock);
        keys[k] = 0;
+
        __pthread_rwlock_unlock(&key_lock);
+       __restore_sigs(&set);
 
        return 0;
 }