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

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 929ff97a..39a18658 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())
 
@@ -44,6 +51,7 @@ void __unlockfile(FILE *);
 #define UNLOCK(x) (*(volatile int *)(x)=0)
 
 void __synccall(void (*)(void *), void *);
+void __synccall_wait(void);
 int __setxid(int, int, int, int);
 
 extern char **__environ;