X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=619bba8613e8d20cc00c69eec83dd054348b5005;hb=fa4a8abd06a401822cc8ba4e352a219544c0118d;hp=23988d92318766c79446a3a1e5912cd10f3ff8b9;hpb=13d1afa46f8098df290008c681816c9eb89ffbdb;p=musl diff --git a/src/internal/libc.h b/src/internal/libc.h index 23988d92..619bba86 100644 --- a/src/internal/libc.h +++ b/src/internal/libc.h @@ -8,7 +8,7 @@ struct __locale_map; struct __locale_struct { - const struct __locale_map *volatile cat[6]; + const struct __locale_map *cat[6]; }; struct tls_module { @@ -18,10 +18,11 @@ struct tls_module { }; struct __libc { - int can_do_threads; - int threaded; - int secure; - volatile int threads_minus_1; + char can_do_threads; + char threaded; + char secure; + volatile signed char need_locks; + int threads_minus_1; size_t *auxv; struct tls_module *tls_head; size_t tls_size, tls_align, tls_cnt; @@ -36,9 +37,14 @@ struct __libc { extern hidden struct __libc __libc; #define libc __libc -void __init_libc(char **, char *); -void __init_tls(size_t *); -void __libc_start_init(void); +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); extern hidden size_t __hwcap; extern hidden size_t __sysinfo; @@ -46,21 +52,7 @@ extern char *__progname, *__progname_full; extern hidden const char __libc_version[]; -/* Designed to avoid any overhead in non-threaded processes */ -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); - -#undef LFS64_2 -#define LFS64_2(x, y) weak_alias(x, y) - -#undef LFS64 -#define LFS64(x) LFS64_2(x, x##64) +hidden void __synccall(void (*)(void *), void *); +hidden int __setxid(int, int, int, int); #endif