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 2eef98e..619bba8 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -8,78 +8,51 @@
 struct __locale_map;
 
 struct __locale_struct {
-       int ctype_utf8;
-       char *messages_name;
-       struct __locale_map *cat[4];
+       const struct __locale_map *cat[6];
+};
+
+struct tls_module {
+       struct tls_module *next;
+       void *image;
+       size_t len, size, align, offset;
 };
 
 struct __libc {
-       int has_thread_pointer;
-       int can_do_threads;
-       int threaded;
-       int secure;
+       char can_do_threads;
+       char threaded;
+       char secure;
+       volatile signed char need_locks;
+       int threads_minus_1;
        size_t *auxv;
-       volatile int threads_minus_1;
-       FILE *ofl_head;
-       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
 
-#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__))
-
-#ifdef __PIC__
-#if __GNUC__ < 4
-#define BROKEN_VISIBILITY 1
-#endif
-#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
 
-#else
-
-#define USE_LIBC_ACCESSOR
-#define ATTR_LIBC_VISIBILITY
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
-
-#endif
-
-
-/* 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) __lock(x)
-#define UNLOCK(x) __unlock(x)
-
-void __synccall(void (*)(void *), void *);
-int __setxid(int, int, int, int);
-
-extern char **__environ;
+hidden void __init_libc(char **, char *);
+hidden void __init_tls(size_t *);
+hidden void __init_ssp(void *);
+hidden void __libc_start_init(void);
+hidden void __funcs_on_exit(void);
+hidden void __funcs_on_quick_exit(void);
+hidden void __libc_exit_fini(void);
+hidden void __fork_handler(int);
 
-#undef weak_alias
-#define weak_alias(old, new) \
-       extern __typeof(old) new __attribute__((weak, alias(#old)))
+extern hidden size_t __hwcap;
+extern hidden size_t __sysinfo;
+extern char *__progname, *__progname_full;
 
-#undef LFS64_2
-#define LFS64_2(x, y) weak_alias(x, y)
+extern hidden const char __libc_version[];
 
-#undef LFS64
-#define LFS64(x) LFS64_2(x, x##64)
+hidden void __synccall(void (*)(void *), void *);
+hidden int __setxid(int, int, int, int);
 
 #endif