new attempt at working around the gcc 3 visibility bug

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 07ed70c..39a1865 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -5,29 +5,38 @@
 #include <stdio.h>
 
 struct __libc {
-       int *(*errno_location)(void);
+       void *main_thread;
        int threaded;
-       int canceldisable;
+       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())
 
@@ -42,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;