move additional pthread internal declarations to pthread_impl.h, hide

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 6810cd8..52e2d80 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -11,15 +11,20 @@ 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 {
        int can_do_threads;
        int threaded;
        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;
        struct __locale_struct global_locale;
 };
@@ -28,35 +33,29 @@ struct __libc {
 #define PAGE_SIZE libc.page_size
 #endif
 
-#ifdef __PIC__
-#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
-#else
-#define ATTR_LIBC_VISIBILITY
-#endif
-
-extern struct __libc __libc ATTR_LIBC_VISIBILITY;
+extern hidden struct __libc __libc;
 #define libc __libc
 
-extern size_t __hwcap ATTR_LIBC_VISIBILITY;
-extern size_t __sysinfo ATTR_LIBC_VISIBILITY;
+hidden void __init_libc(char **, char *);
+hidden void __init_tls(size_t *);
+hidden void __libc_start_init(void);
+
+extern hidden size_t __hwcap;
+extern hidden size_t __sysinfo;
 extern char *__progname, *__progname_full;
 
+extern hidden const char __libc_version[];
+
 /* 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;
+hidden void __lock(volatile int *);
+hidden void __unlock(volatile int *);
+hidden int __lockfile(FILE *);
+hidden void __unlockfile(FILE *);
 #define LOCK(x) __lock(x)
 #define UNLOCK(x) __unlock(x)
 
-void __synccall(void (*)(void *), void *);
-int __setxid(int, int, int, int);
-
-extern char **__environ;
-
-#undef weak_alias
-#define weak_alias(old, new) \
-       extern __typeof(old) new __attribute__((weak, alias(#old)))
+hidden void __synccall(void (*)(void *), void *);
+hidden int __setxid(int, int, int, int);
 
 #undef LFS64_2
 #define LFS64_2(x, y) weak_alias(x, y)