X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=d6797f90e6ac5991179daaa30ba638ebf5070856;hp=906de2caba70c42988ca5123f5bc6f505ec88267;hb=f34d0ea511e552851c8c6148fb113816f41e6759;hpb=acb04806628990ad2430e04261dd20f23babde5e

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 906de2ca..d6797f90 100644
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,31 +5,38 @@
 #include <stdio.h>
 
 struct __libc {
-	int *(*errno_location)(void);
-	void (*testcancel)(void);
+	void *main_thread;
 	int threaded;
-	int canceldisable;
-	void (*fork_handler)(int);
+	int secure;
+	size_t *auxv;
 	int (*atexit)(void (*)(void));
 	void (*fini)(void);
 	void (*ldso_fini)(void);
 	volatile int threads_minus_1;
-	int ofl_lock;
+	int canceldisable;
 	FILE *ofl_head;
-	void *main_thread;
+	int ofl_lock;
 };
 
 
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
-extern struct __libc __libc __attribute__((visibility("hidden")));
-#define libc __libc
+#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
+#endif
 
-#elif !defined(__PIC__)
-extern struct __libc __libc;
+extern struct __libc __libc ATTR_LIBC_VISIBILITY;
 #define libc __libc
 
 #else
+
 #define USE_LIBC_ACCESSOR
+#define ATTR_LIBC_VISIBILITY
 extern struct __libc *__libc_loc(void) __attribute__((const));
 #define libc (*__libc_loc())
 
@@ -38,11 +45,14 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 /* Designed to avoid any overhead in non-threaded processes */
 void __lock(volatile int *);
-void __lockfile(FILE *);
+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) (*(volatile int *)(x)=0)
+#define UNLOCK(x) (libc.threads_minus_1 ? (__unlock(x),1) : ((void)(x),1))
 
 void __synccall(void (*)(void *), void *);
+void __synccall_wait(void);
 int __setxid(int, int, int, int);
 
 extern char **__environ;