X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=5e14518312c77025d107f3f11a2d1ea626f2734a;hb=056f9d818eaf1dbe9e9d63b64b109fd9b608fa36;hp=929ff97ae4257d8493d6c6c0e7c32c6ce58c5445;hpb=dba68bf98fc708cea4c478278c889fc7ad802b00;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 929ff97a..5e145183 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,59 +3,68 @@
 
 #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 {
-	int *(*errno_location)(void);
-	void (*testcancel)(void);
+	int can_do_threads;
 	int threaded;
-	int canceldisable;
-	void (*fork_handler)(int);
-	int (*atexit)(void (*)(void));
-	void (*fini)(void);
-	void (*ldso_fini)(void);
+	int secure;
 	volatile int threads_minus_1;
-	int ofl_lock;
-	FILE *ofl_head;
-	void *main_thread;
+	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;
 };
 
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
+#endif
 
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
-extern struct __libc __libc __attribute__((visibility("hidden")));
-#define libc __libc
-
-#elif !defined(__PIC__)
-extern struct __libc __libc;
-#define libc __libc
-
+#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 *);
-int __lockfile(FILE *);
-void __unlockfile(FILE *);
-#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
-#define UNLOCK(x) (*(volatile int *)(x)=0)
+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)