add new masked cancellation mode

[musl] / src / internal / libc.h

diff --git a/src/internal/libc.h b/src/internal/libc.h
index 929ff97..2eef98e 100644 (file)
--- a/src/internal/libc.h
+++ b/src/internal/libc.h
@@ -3,33 +3,56 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <limits.h>
+
+struct __locale_map;
+
+struct __locale_struct {
+       int ctype_utf8;
+       char *messages_name;
+       struct __locale_map *cat[4];
+};
 
 struct __libc {
-       int *(*errno_location)(void);
-       void (*testcancel)(void);
+       int has_thread_pointer;
+       int can_do_threads;
        int threaded;
-       int canceldisable;
-       void (*fork_handler)(int);
-       int (*atexit)(void (*)(void));
-       void (*fini)(void);
-       void (*ldso_fini)(void);
+       int secure;
+       size_t *auxv;
        volatile int threads_minus_1;
-       int ofl_lock;
        FILE *ofl_head;
-       void *main_thread;
+       int ofl_lock[2];
+       size_t tls_size;
+       size_t page_size;
+       volatile int uselocale_cnt;
+       volatile int bytelocale_cnt_minus_1;
+       struct __locale_struct global_locale;
 };
 
+extern size_t __hwcap;
 
-#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
-extern struct __libc __libc __attribute__((visibility("hidden")));
-#define libc __libc
+#ifndef PAGE_SIZE
+#define PAGE_SIZE libc.page_size
+#endif
+
+#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__))
 
-#elif !defined(__PIC__)
-extern struct __libc __libc;
+#ifdef __PIC__
+#if __GNUC__ < 4
+#define BROKEN_VISIBILITY 1
+#endif
+#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
+#else
+#define ATTR_LIBC_VISIBILITY
+#endif
+
+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())
 
@@ -37,25 +60,24 @@ extern struct __libc *__libc_loc(void) __attribute__((const));
 
 
 /* Designed to avoid any overhead in non-threaded processes */
-void __lock(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)
+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)