X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=d625b56afc3ab310ac644929ff57d03e9a0ca9f1;hb=513136efa4274c39ed1c071ae4f4f2b10118f9f5;hp=0ec3691e4f512f2b21dda5f238c0584b559e7cc8;hpb=0c29adfe427ab6ed98cb73644f8f52a76045245c;p=musl

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 0ec3691e..d625b56a 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,29 +3,34 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
 
 struct __libc {
 	void *main_thread;
 	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];
+	size_t tls_size;
+	size_t page_size;
 };
 
+extern size_t __hwcap;
 
-#if !defined(__PIC__) || 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
+#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"))) 
+#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
 #else
 #define ATTR_LIBC_VISIBILITY
 #endif
@@ -44,26 +49,24 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 
 /* 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 __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)