X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=52e2d80fd0ca7edbe29608bd2b75605c1199b2e7;hb=49722a8ed4c8fd056ac8aebd6bec9d998b700f80;hp=ca06f3199340d04e92b8c5f69fa0b74a864236f5;hpb=8431d7972fd9be0fdcaff8516316d748e81724bb;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index ca06f319..52e2d80f 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,65 +3,59 @@
 
 #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];
-	volatile size_t tls_size, tls_cnt;
+	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__) || defined(__TINYC__)
-
-#ifdef __PIC__
-#if __GNUC__ < 4
-#define BROKEN_VISIBILITY 1
-#endif
-#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) 
-#else
-#define ATTR_LIBC_VISIBILITY
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
 #endif
 
-extern struct __libc __libc ATTR_LIBC_VISIBILITY;
+extern hidden struct __libc __libc;
 #define libc __libc
 
-#else
+hidden void __init_libc(char **, char *);
+hidden void __init_tls(size_t *);
+hidden void __libc_start_init(void);
 
-#define USE_LIBC_ACCESSOR
-#define ATTR_LIBC_VISIBILITY
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
-
-#endif
+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 *);
-void __unlock(volatile int *);
-int __lockfile(FILE *);
-void __unlockfile(FILE *);
-#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))
-
-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)))
+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)
+
+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)