unify static and dynamic linked implementations of thread-local storage

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 60a25ef..5e14518 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,61 +3,68 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
 
-struct __libc {
-       int *(*errno_location)(void);
-       void (*cancelpt)(int);
-       void (*lock)(volatile int *);
-       void (*lockfile)(FILE *);
-       void (**tsd_keys)(void *);
-       void (*sigtimer)();
-       int (*atexit)(void (*)(void));
-       void (*fini)(void);
-       void (*ldso_fini)(void);
-       volatile int threads_minus_1;
-       int ofl_lock;
-       int (*rsyscall)(int, long, long, long, long, long, long);
-       void (*fork_handler)(int);
-       FILE *ofl_head;
+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;
+};
 
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
-extern struct __libc __libc __attribute__((visibility("hidden")));
-#define libc __libc
+struct __libc {
+       int can_do_threads;
+       int threaded;
+       int secure;
+       volatile int threads_minus_1;
+       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;
+};
 
-#elif !defined(__PIC__)
-extern struct __libc __libc;
-#define libc __libc
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
+#endif
 
+#ifdef __PIC__
+#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
 #else
-#define USE_LIBC_ACCESSOR
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
-
+#define ATTR_LIBC_VISIBILITY
 #endif
 
+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 *);
-void __lockfile(FILE *);
-#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
-#define UNLOCK(x) (*(x)=0)
-#define CANCELPT(x) (libc.cancelpt ? libc.cancelpt((x)),0 : (void)(x),0)
-#define CANCELPT_BEGIN CANCELPT(1)
-#define CANCELPT_TRY CANCELPT(0)
-#define CANCELPT_END CANCELPT(-1)
+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) __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) \
        extern __typeof(old) new __attribute__((weak, alias(#old)))
 
 #undef LFS64_2
-//#define LFS64_2(x, y) weak_alias(x, y)
-#define LFS64_2(x, y) extern __typeof(x) y
+#define LFS64_2(x, y) weak_alias(x, y)
 
 #undef LFS64
 #define LFS64(x) LFS64_2(x, x##64)