X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Flibc.h;h=c9416f075b417e0a85198d82819c1bb78b52017b;hb=de80ea9f1c2821cbb4205533b86d5d17f9e8d376;hp=ea863d6730e11cd83ff9db32baea830dacc70be5;hpb=e1b9c1b01be294cc2865acfe33544d5e5cc50eb4;p=musl diff --git a/src/internal/libc.h b/src/internal/libc.h index ea863d67..c9416f07 100644 --- a/src/internal/libc.h +++ b/src/internal/libc.h @@ -16,17 +16,18 @@ struct __libc { int canceldisable; FILE *ofl_head; int ofl_lock[2]; + size_t tls_size; }; extern size_t __hwcap; -#if !defined(__PIC__) || 100*__GNUC__+__GNUC_MINOR__ >= 303 || defined(__PCC__) || defined(__TINYC__) +#if !defined(__PIC__) || (100*__GNUC__+__GNUC_MINOR__ >= 303 && !defined(__PCC__)) #ifdef __PIC__ #if __GNUC__ < 4 #define BROKEN_VISIBILITY 1 #endif -#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) +#define ATTR_LIBC_VISIBILITY __attribute__((visibility("hidden"))) #else #define ATTR_LIBC_VISIBILITY #endif @@ -45,10 +46,10 @@ extern struct __libc *__libc_loc(void) __attribute__((const)); /* Designed to avoid any overhead in non-threaded processes */ -void __lock(volatile int *); -void __unlock(volatile int *); -int __lockfile(FILE *); -void __unlockfile(FILE *); +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) (libc.threads_minus_1 ? (__lock(x),1) : ((void)(x),1)) #define UNLOCK(x) (libc.threads_minus_1 ? (__unlock(x),1) : ((void)(x),1)) @@ -56,7 +57,6 @@ 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) \