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 508911480645e32b769ad01059419230f97d31f5..5e14518312c77025d107f3f11a2d1ea626f2734a 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,30 +3,37 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
+
+struct __locale_map;
+
+struct __locale_struct {
+       const struct __locale_map *volatile cat[6];
+};
+
+struct tls_module {
+       struct tls_module *next;
+       void *image;
+       size_t len, size, align, offset;
+};
 
 struct __libc {
-       void *main_thread;
+       int can_do_threads;
        int threaded;
        int secure;
-       size_t *auxv;
-       int (*atexit)(void (*)(void));
-       void (*fini)(void);
-       void (*ldso_fini)(void);
        volatile int threads_minus_1;
-       int canceldisable;
-       FILE *ofl_head;
-       int ofl_lock[2];
-       size_t tls_size;
+       size_t *auxv;
+       struct tls_module *tls_head;
+       size_t tls_size, tls_align, tls_cnt;
+       size_t page_size;
+       struct __locale_struct global_locale;
 };
 
-extern size_t __hwcap;
-
-#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__))
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
+#endif
 
 #ifdef __PIC__
-#if __GNUC__ < 4
-#define BROKEN_VISIBILITY 1
-#endif
 #define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
 #else
 #define ATTR_LIBC_VISIBILITY
@@ -35,29 +42,22 @@ extern size_t __hwcap;
 extern struct __libc __libc ATTR_LIBC_VISIBILITY;
 #define libc __libc
 
-#else
-
-#define USE_LIBC_ACCESSOR
-#define ATTR_LIBC_VISIBILITY
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
-
-#endif
-
+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;
 void __unlock(volatile int *) ATTR_LIBC_VISIBILITY;
 int __lockfile(FILE *) ATTR_LIBC_VISIBILITY;
 void __unlockfile(FILE *) ATTR_LIBC_VISIBILITY;
-#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
-#define UNLOCK(x) (libc.threads_minus_1 ? (__unlock(x),1) : ((void)(x),1))
+#define LOCK(x) __lock(x)
+#define UNLOCK(x) __unlock(x)
 
 void __synccall(void (*)(void *), void *);
 int __setxid(int, int, int, int);
 
 extern char **__environ;
-#define environ __environ
 
 #undef weak_alias
 #define weak_alias(old, new) \