projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs in cancellable syscall asm
[musl]
/
src
/
internal
/
libc.h
diff --git
a/src/internal/libc.h
b/src/internal/libc.h
index
8a84be0
..
d6df93d
100644
(file)
--- a/
src/internal/libc.h
+++ b/
src/internal/libc.h
@@
-5,34
+5,44
@@
#include <stdio.h>
struct __libc {
#include <stdio.h>
struct __libc {
+ int *(*errno_location)(void);
+ void (*testcancel)(void);
void (*lock)(volatile int *);
void (*lock)(volatile int *);
- void (*cancelpt)(int);
+ void (*lockfile)(FILE *);
+ void (*fork_handler)(int);
int (*atexit)(void (*)(void));
void (*fini)(void);
void (*ldso_fini)(void);
int (*atexit)(void (*)(void));
void (*fini)(void);
void (*ldso_fini)(void);
- int *(*errno_location)(void);
volatile int threads_minus_1;
volatile int threads_minus_1;
- int
(*rsyscall)(int, long, long, long, long, long, long)
;
-
void (**tsd_keys)(void *)
;
-
void (*fork_handler)(int)
;
+ int
ofl_lock
;
+
FILE *ofl_head
;
+
int canceldisable
;
};
};
-#ifdef __PIC__
-extern struct __libc *__libc_loc(void) __attribute__((const));
-#define libc (*__libc_loc())
-#else
+
+#if 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
+extern struct __libc __libc __attribute__((visibility("hidden")));
+#define libc __libc
+
+#elif !defined(__PIC__)
extern struct __libc __libc;
#define libc __libc
extern struct __libc __libc;
#define libc __libc
+
+#else
+#define USE_LIBC_ACCESSOR
+extern struct __libc *__libc_loc(void) __attribute__((const));
+#define libc (*__libc_loc())
+
#endif
/* Designed to avoid any overhead in non-threaded processes */
void __lock(volatile int *);
#endif
/* Designed to avoid any overhead in non-threaded processes */
void __lock(volatile int *);
+void __lockfile(FILE *);
#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
#define UNLOCK(x) (*(x)=0)
#define LOCK(x) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1))
#define UNLOCK(x) (*(x)=0)
-#define CANCELPT(x) (libc.cancelpt ? libc.cancelpt((x)),0 : (void)(x),0)
-#define CANCELPT_BEGIN CANCELPT(1)
-#define CANCELPT_END CANCELPT(0)
+
+int __rsyscall(int, long, long, long, long, long, long);
extern char **__environ;
#define environ __environ
extern char **__environ;
#define environ __environ