projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove cruft from pthread structure (old cancellation stuff)
[musl]
/
src
/
internal
/
libc.h
diff --git
a/src/internal/libc.h
b/src/internal/libc.h
index
929ff97
..
0ec3691
100644
(file)
--- a/
src/internal/libc.h
+++ b/
src/internal/libc.h
@@
-5,31
+5,38
@@
#include <stdio.h>
struct __libc {
#include <stdio.h>
struct __libc {
- int *(*errno_location)(void);
- void (*testcancel)(void);
+ void *main_thread;
int threaded;
int threaded;
- int
canceldisabl
e;
-
void (*fork_handler)(int)
;
+ int
secur
e;
+
size_t *auxv
;
int (*atexit)(void (*)(void));
void (*fini)(void);
void (*ldso_fini)(void);
volatile int threads_minus_1;
int (*atexit)(void (*)(void));
void (*fini)(void);
void (*ldso_fini)(void);
volatile int threads_minus_1;
- int
ofl_lock
;
+ int
canceldisable
;
FILE *ofl_head;
FILE *ofl_head;
-
void *main_thread
;
+
int ofl_lock[2]
;
};
};
-#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__)
-#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 libc __libc
#else
+
#define USE_LIBC_ACCESSOR
#define USE_LIBC_ACCESSOR
+#define ATTR_LIBC_VISIBILITY
extern struct __libc *__libc_loc(void) __attribute__((const));
#define libc (*__libc_loc())
extern struct __libc *__libc_loc(void) __attribute__((const));
#define libc (*__libc_loc())
@@
-38,10
+45,11
@@
extern struct __libc *__libc_loc(void) __attribute__((const));
/* Designed to avoid any overhead in non-threaded processes */
void __lock(volatile int *);
/* 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))
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 *);
int __setxid(int, int, int, int);
void __synccall(void (*)(void *), void *);
int __setxid(int, int, int, int);