projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash if TLS library is loaded into process with no thread pointer
[musl]
/
src
/
internal
/
libc.h
diff --git
a/src/internal/libc.h
b/src/internal/libc.h
index
45d5c9e
..
f88d846
100644
(file)
--- a/
src/internal/libc.h
+++ b/
src/internal/libc.h
@@
-15,13
+15,18
@@
struct __libc {
volatile int threads_minus_1;
int canceldisable;
FILE *ofl_head;
volatile int threads_minus_1;
int canceldisable;
FILE *ofl_head;
- int ofl_lock;
+ int ofl_lock[2];
+ size_t tls_size;
};
};
+extern size_t __hwcap;
#if !defined(__PIC__) || 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__)
#ifdef __PIC__
#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
#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden")))
#else
#define ATTR_LIBC_VISIBILITY
@@
-42,13
+47,13
@@
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 *);
void __synccall(void (*)(void *), void *);
-void __synccall_wait(void);
int __setxid(int, int, int, int);
extern char **__environ;
int __setxid(int, int, int, int);
extern char **__environ;
@@
-59,8
+64,7
@@
extern char **__environ;
extern __typeof(old) new __attribute__((weak, alias(#old)))
#undef LFS64_2
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)
#undef LFS64
#define LFS64(x) LFS64_2(x, x##64)