restore lock-skipping for processes that return to single-threaded state

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 0a27918..619bba8 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -8,7 +8,7 @@
 struct __locale_map;
 
 struct __locale_struct {
-       const struct __locale_map *volatile cat[6];
+       const struct __locale_map *cat[6];
 };
 
 struct tls_module {
@@ -18,10 +18,11 @@ struct tls_module {
 };
 
 struct __libc {
-       int can_do_threads;
-       int threaded;
-       int secure;
-       volatile int threads_minus_1;
+       char can_do_threads;
+       char threaded;
+       char secure;
+       volatile signed char need_locks;
+       int threads_minus_1;
        size_t *auxv;
        struct tls_module *tls_head;
        size_t tls_size, tls_align, tls_cnt;
@@ -51,12 +52,6 @@ extern char *__progname, *__progname_full;
 
 extern hidden const char __libc_version[];
 
-/* Designed to avoid any overhead in non-threaded processes */
-hidden void __lock(volatile int *);
-hidden void __unlock(volatile int *);
-#define LOCK(x) __lock(x)
-#define UNLOCK(x) __unlock(x)
-
 hidden void __synccall(void (*)(void *), void *);
 hidden int __setxid(int, int, int, int);