X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=f536eaf6e5a11d408c3e30e9370fc70f64e917f3;hb=50a298ea3b122efbb31e7674a20e6c7dc30ca1dc;hp=bbbb3a4cc8047682f4306ea7737df293dc6c762c;hpb=b470030f839a375e5030ec9d44903ef7581c15a2;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index bbbb3a4c..f536eaf6 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,60 +3,67 @@
 
 #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 (*lock)(volatile int *);
-	void (*cancelpt)(int);
-	int (*atexit)(void (*)(void));
-	void (*fini)(void);
-	void (*ldso_fini)(void);
-	int *(*errno_location)(void);
+	int can_do_threads;
+	int threaded;
+	int secure;
 	volatile int threads_minus_1;
-	int (*rsyscall)(int, long, long, long, long, long, long);
-	void (**tsd_keys)(void *);
-	void (*fork_handler)(int);
-	FILE *ofl_head;
-	int ofl_lock;
-	void (*lockfile)(FILE *);
+	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
+#define weak __attribute__((__weak__))
+#define hidden __attribute__((__visibility__("hidden")))
 
-#elif !defined(__PIC__)
-extern struct __libc __libc;
+extern hidden struct __libc __libc;
 #define libc __libc
 
-#else
-#define USE_LIBC_ACCESSOR
-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 __lockfile(FILE *);
-#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
-#define UNLOCK(x) (*(x)=0)
-#define CANCELPT(x) (libc.cancelpt ? libc.cancelpt((x)),0 : (void)(x),0)
-#define CANCELPT_BEGIN CANCELPT(1)
-#define CANCELPT_TRY CANCELPT(0)
-#define CANCELPT_END CANCELPT(-1)
+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;
-#define environ __environ
 
 #undef weak_alias
 #define weak_alias(old, new) \
-	extern __typeof(old) new __attribute__((weak, alias(#old)))
+	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)