unify static and dynamic linked implementations of thread-local storage

[oweals/musl.git] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 00d1b41acc03d13f57e3ba8ed828b43173477605..5e14518312c77025d107f3f11a2d1ea626f2734a 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -8,9 +8,13 @@
 struct __locale_map;
 
 struct __locale_struct {
-       volatile int ctype_utf8;
-       char *messages_name;
-       struct __locale_map *volatile cat[4];
+       const struct __locale_map *volatile cat[6];
+};
+
+struct tls_module {
+       struct tls_module *next;
+       void *image;
+       size_t len, size, align, offset;
 };
 
 struct __libc {
@@ -19,17 +23,12 @@ struct __libc {
        int secure;
        volatile int threads_minus_1;
        size_t *auxv;
-       FILE *ofl_head;
-       volatile int ofl_lock[2];
-       size_t tls_size;
+       struct tls_module *tls_head;
+       size_t tls_size, tls_align, tls_cnt;
        size_t page_size;
-       volatile int uselocale_cnt;
-       volatile int bytelocale_cnt_minus_1;
        struct __locale_struct global_locale;
 };
 
-extern size_t __hwcap;
-
 #ifndef PAGE_SIZE
 #define PAGE_SIZE libc.page_size
 #endif
@@ -43,6 +42,9 @@ extern size_t __hwcap;
 extern struct __libc __libc ATTR_LIBC_VISIBILITY;
 #define libc __libc
 
+extern size_t __hwcap ATTR_LIBC_VISIBILITY;
+extern size_t __sysinfo ATTR_LIBC_VISIBILITY;
+extern char *__progname, *__progname_full;
 
 /* Designed to avoid any overhead in non-threaded processes */
 void __lock(volatile int *) ATTR_LIBC_VISIBILITY;