make linking of thread-start with explicit scheduling conditional

[musl] / src / thread / pthread_key_create.c

diff --git a/src/thread/pthread_key_create.c b/src/thread/pthread_key_create.c
index ef8a755..a78e507 100644 (file)
--- a/src/thread/pthread_key_create.c
+++ b/src/thread/pthread_key_create.c
@@ -1,25 +1,23 @@
 #include "pthread_impl.h"
 
-const size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
+volatile size_t __pthread_tsd_size = sizeof(void *) * PTHREAD_KEYS_MAX;
 void *__pthread_tsd_main[PTHREAD_KEYS_MAX] = { 0 };
 
-static void (*keys[PTHREAD_KEYS_MAX])(void *);
+static void (*volatile keys[PTHREAD_KEYS_MAX])(void *);
 
 static void nodtor(void *dummy)
 {
 }
 
-int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
+int __pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
 {
        unsigned i = (uintptr_t)&k / 16 % PTHREAD_KEYS_MAX;
        unsigned j = i;
+       pthread_t self = __pthread_self();
 
-       if (libc.has_thread_pointer) {
-               pthread_t self = __pthread_self();
-               /* This can only happen in the main thread before
-                * pthread_create has been called. */
-               if (!self->tsd) self->tsd = __pthread_tsd_main;
-       }
+       /* This can only happen in the main thread before
+        * pthread_create has been called. */
+       if (!self->tsd) self->tsd = __pthread_tsd_main;
 
        if (!dtor) dtor = nodtor;
        do {
@@ -31,7 +29,7 @@ int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
        return EAGAIN;
 }
 
-int pthread_key_delete(pthread_key_t k)
+int __pthread_key_delete(pthread_key_t k)
 {
        keys[k] = 0;
        return 0;
@@ -53,3 +51,6 @@ void __pthread_tsd_run_dtors()
                }
        }
 }
+
+weak_alias(__pthread_key_delete, pthread_key_delete);
+weak_alias(__pthread_key_create, pthread_key_create);