authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-12 16:26:14-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-12 16:26:14-04:00
log205c4139620cddb083cff16e5d9264918f3876c2
treefc6814329c85a7c0013b312240c5f5be07a4377c
parentaa49f972d655eb61ca899f76ba37933254f780a2
signaturelock-open Commit is signed but in an unrecognized format.

update musl headers to v1.2.0


116 files changed, 1299 insertions(+), 1128 deletions(-)

lib/libc/include/aarch64-linux-musl/bits/alltypes.h+66-55
...@@ -2,16 +2,13 @@...@@ -2,16 +2,13 @@
2#define _Int64 long2#define _Int64 long
3#define _Reg long3#define _Reg long
44
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)5#if __AARCH64EB__
6typedef __builtin_va_list va_list;6#define __BYTE_ORDER 4321
7#define __DEFINED_va_list7#else
8#endif8#define __BYTE_ORDER 1234
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif9#endif
1410
11#define __LONG_MAX 0x7fffffffffffffffL
1512
16#ifndef __cplusplus13#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)14#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -53,52 +50,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -53,52 +50,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
53#define __DEFINED_max_align_t50#define __DEFINED_max_align_t
54#endif51#endif
5552
5653#define __LITTLE_ENDIAN 1234
57#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)54#define __BIG_ENDIAN 4321
58typedef long time_t;55#define __USE_TIME_BITS64 1
59#define __DEFINED_time_t
60#endif
61
62#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
63typedef long suseconds_t;
64#define __DEFINED_suseconds_t
65#endif
66
67
68#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
69typedef struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
70#define __DEFINED_pthread_attr_t
71#endif
72
73#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
74typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
75#define __DEFINED_pthread_mutex_t
76#endif
77
78#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
79typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
80#define __DEFINED_mtx_t
81#endif
82
83#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
84typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
85#define __DEFINED_pthread_cond_t
86#endif
87
88#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
89typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
90#define __DEFINED_cnd_t
91#endif
92
93#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
94typedef struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
95#define __DEFINED_pthread_rwlock_t
96#endif
97
98#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
99typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
100#define __DEFINED_pthread_barrier_t
101#endif
10256
103#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)57#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
104typedef unsigned _Addr size_t;58typedef unsigned _Addr size_t;
...@@ -135,6 +89,16 @@ typedef _Reg register_t;...@@ -135,6 +89,16 @@ typedef _Reg register_t;
135#define __DEFINED_register_t89#define __DEFINED_register_t
136#endif90#endif
13791
92#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
93typedef _Int64 time_t;
94#define __DEFINED_time_t
95#endif
96
97#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
98typedef _Int64 suseconds_t;
99#define __DEFINED_suseconds_t
100#endif
101
138102
139#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)103#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
140typedef signed char int8_t;104typedef signed char int8_t;
...@@ -270,7 +234,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -270,7 +234,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
270#endif234#endif
271235
272#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)236#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
273struct timespec { time_t tv_sec; long tv_nsec; };237struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
274#define __DEFINED_struct_timespec238#define __DEFINED_struct_timespec
275#endif239#endif
276240
...@@ -366,6 +330,17 @@ typedef struct _IO_FILE FILE;...@@ -366,6 +330,17 @@ typedef struct _IO_FILE FILE;
366#endif330#endif
367331
368332
333#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
334typedef __builtin_va_list va_list;
335#define __DEFINED_va_list
336#endif
337
338#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
339typedef __builtin_va_list __isoc_va_list;
340#define __DEFINED___isoc_va_list
341#endif
342
343
369#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)344#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
370typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;345typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
371#define __DEFINED_mbstate_t346#define __DEFINED_mbstate_t
...@@ -401,6 +376,42 @@ typedef unsigned short sa_family_t;...@@ -401,6 +376,42 @@ typedef unsigned short sa_family_t;
401#endif376#endif
402377
403378
379#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
380typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
381#define __DEFINED_pthread_attr_t
382#endif
383
384#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
385typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
386#define __DEFINED_pthread_mutex_t
387#endif
388
389#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
390typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
391#define __DEFINED_mtx_t
392#endif
393
394#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
395typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
396#define __DEFINED_pthread_cond_t
397#endif
398
399#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
400typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
401#define __DEFINED_cnd_t
402#endif
403
404#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
405typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
406#define __DEFINED_pthread_rwlock_t
407#endif
408
409#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
410typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
411#define __DEFINED_pthread_barrier_t
412#endif
413
414
404#undef _Addr415#undef _Addr
405#undef _Int64416#undef _Int64
406#undef _Reg417#undef _Reg
\ No newline at end of file
lib/libc/include/aarch64-linux-musl/bits/endian.h deleted-5
...@@ -1,5 +0,0 @@
1#if __AARCH64EB__
2#define __BYTE_ORDER __BIG_ENDIAN
3#else
4#define __BYTE_ORDER __LITTLE_ENDIAN
5#endif
\ No newline at end of file
lib/libc/include/aarch64-linux-musl/bits/socket.h deleted-33
...@@ -1,33 +0,0 @@
1#include <endian.h>
2
3struct msghdr {
4 void *msg_name;
5 socklen_t msg_namelen;
6 struct iovec *msg_iov;
7#if __BYTE_ORDER == __BIG_ENDIAN
8 int __pad1, msg_iovlen;
9#else
10 int msg_iovlen, __pad1;
11#endif
12 void *msg_control;
13#if __BYTE_ORDER == __BIG_ENDIAN
14 int __pad2;
15 socklen_t msg_controllen;
16#else
17 socklen_t msg_controllen;
18 int __pad2;
19#endif
20 int msg_flags;
21};
22
23struct cmsghdr {
24#if __BYTE_ORDER == __BIG_ENDIAN
25 int __pad1;
26 socklen_t cmsg_len;
27#else
28 socklen_t cmsg_len;
29 int __pad1;
30#endif
31 int cmsg_level;
32 int cmsg_type;
33};
\ No newline at end of file
lib/libc/include/aarch64-linux-musl/bits/syscall.h+5-1
...@@ -287,6 +287,8 @@...@@ -287,6 +287,8 @@
287#define __NR_fsconfig 431287#define __NR_fsconfig 431
288#define __NR_fsmount 432288#define __NR_fsmount 432
289#define __NR_fspick 433289#define __NR_fspick 433
290#define __NR_pidfd_open 434
291#define __NR_clone3 435
290292
291#define SYS_io_setup 0293#define SYS_io_setup 0
292#define SYS_io_destroy 1294#define SYS_io_destroy 1
...@@ -576,4 +578,6 @@...@@ -576,4 +578,6 @@
576#define SYS_fsopen 430578#define SYS_fsopen 430
577#define SYS_fsconfig 431579#define SYS_fsconfig 431
578#define SYS_fsmount 432580#define SYS_fsmount 432
579#define SYS_fspick 433
\ No newline at end of file
581#define SYS_fspick 433
582#define SYS_pidfd_open 434
583#define SYS_clone3 435
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/alltypes.h+67-55
...@@ -1,17 +1,15 @@...@@ -1,17 +1,15 @@
1#define _REDIR_TIME64 1
1#define _Addr int2#define _Addr int
2#define _Int64 long long3#define _Int64 long long
3#define _Reg int4#define _Reg int
45
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)6#if __ARMEB__
6typedef __builtin_va_list va_list;7#define __BYTE_ORDER 4321
7#define __DEFINED_va_list8#else
8#endif9#define __BYTE_ORDER 1234
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif10#endif
1411
12#define __LONG_MAX 0x7fffffffL
1513
16#ifndef __cplusplus14#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)15#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -37,52 +35,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -37,52 +35,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
37#define __DEFINED_max_align_t35#define __DEFINED_max_align_t
38#endif36#endif
3937
4038#define __LITTLE_ENDIAN 1234
41#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)39#define __BIG_ENDIAN 4321
42typedef long time_t;40#define __USE_TIME_BITS64 1
43#define __DEFINED_time_t
44#endif
45
46#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
47typedef long suseconds_t;
48#define __DEFINED_suseconds_t
49#endif
50
51
52#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
53typedef struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
54#define __DEFINED_pthread_attr_t
55#endif
56
57#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
58typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
59#define __DEFINED_pthread_mutex_t
60#endif
61
62#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
63typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
64#define __DEFINED_mtx_t
65#endif
66
67#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
68typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
69#define __DEFINED_pthread_cond_t
70#endif
71
72#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
73typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
74#define __DEFINED_cnd_t
75#endif
76
77#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
78typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
79#define __DEFINED_pthread_rwlock_t
80#endif
81
82#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
83typedef struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
84#define __DEFINED_pthread_barrier_t
85#endif
8641
87#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)42#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
88typedef unsigned _Addr size_t;43typedef unsigned _Addr size_t;
...@@ -119,6 +74,16 @@ typedef _Reg register_t;...@@ -119,6 +74,16 @@ typedef _Reg register_t;
119#define __DEFINED_register_t74#define __DEFINED_register_t
120#endif75#endif
12176
77#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
78typedef _Int64 time_t;
79#define __DEFINED_time_t
80#endif
81
82#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
83typedef _Int64 suseconds_t;
84#define __DEFINED_suseconds_t
85#endif
86
12287
123#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)88#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
124typedef signed char int8_t;89typedef signed char int8_t;
...@@ -254,7 +219,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -254,7 +219,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
254#endif219#endif
255220
256#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)221#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
257struct timespec { time_t tv_sec; long tv_nsec; };222struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
258#define __DEFINED_struct_timespec223#define __DEFINED_struct_timespec
259#endif224#endif
260225
...@@ -350,6 +315,17 @@ typedef struct _IO_FILE FILE;...@@ -350,6 +315,17 @@ typedef struct _IO_FILE FILE;
350#endif315#endif
351316
352317
318#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
319typedef __builtin_va_list va_list;
320#define __DEFINED_va_list
321#endif
322
323#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
324typedef __builtin_va_list __isoc_va_list;
325#define __DEFINED___isoc_va_list
326#endif
327
328
353#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)329#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
354typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;330typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
355#define __DEFINED_mbstate_t331#define __DEFINED_mbstate_t
...@@ -385,6 +361,42 @@ typedef unsigned short sa_family_t;...@@ -385,6 +361,42 @@ typedef unsigned short sa_family_t;
385#endif361#endif
386362
387363
364#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
365typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
366#define __DEFINED_pthread_attr_t
367#endif
368
369#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
370typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
371#define __DEFINED_pthread_mutex_t
372#endif
373
374#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
375typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
376#define __DEFINED_mtx_t
377#endif
378
379#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
380typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
381#define __DEFINED_pthread_cond_t
382#endif
383
384#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
385typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
386#define __DEFINED_cnd_t
387#endif
388
389#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
390typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
391#define __DEFINED_pthread_rwlock_t
392#endif
393
394#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
395typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
396#define __DEFINED_pthread_barrier_t
397#endif
398
399
388#undef _Addr400#undef _Addr
389#undef _Int64401#undef _Int64
390#undef _Reg402#undef _Reg
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/endian.h deleted-5
...@@ -1,5 +0,0 @@
1#if __ARMEB__
2#define __BYTE_ORDER __BIG_ENDIAN
3#else
4#define __BYTE_ORDER __LITTLE_ENDIAN
5#endif
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/ipcstat.h created+1
...@@ -0,0 +1 @@
1#define IPC_STAT 0x102
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/limits.h deleted-7
...@@ -1,7 +0,0 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define LONG_BIT 32
4#endif
5
6#define LONG_MAX 0x7fffffffL
7#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/msg.h+9-6
...@@ -1,15 +1,18 @@...@@ -1,15 +1,18 @@
1struct msqid_ds {1struct msqid_ds {
2 struct ipc_perm msg_perm;2 struct ipc_perm msg_perm;
3 time_t msg_stime;3 unsigned long __msg_stime_lo;
4 int __unused1;4 unsigned long __msg_stime_hi;
5 time_t msg_rtime;5 unsigned long __msg_rtime_lo;
6 int __unused2;6 unsigned long __msg_rtime_hi;
7 time_t msg_ctime;7 unsigned long __msg_ctime_lo;
8 int __unused3;8 unsigned long __msg_ctime_hi;
9 unsigned long msg_cbytes;9 unsigned long msg_cbytes;
10 msgqnum_t msg_qnum;10 msgqnum_t msg_qnum;
11 msglen_t msg_qbytes;11 msglen_t msg_qbytes;
12 pid_t msg_lspid;12 pid_t msg_lspid;
13 pid_t msg_lrpid;13 pid_t msg_lrpid;
14 unsigned long __unused[2];14 unsigned long __unused[2];
15 time_t msg_stime;
16 time_t msg_rtime;
17 time_t msg_ctime;
15};18};
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/sem.h+6-4
...@@ -1,9 +1,9 @@...@@ -1,9 +1,9 @@
1struct semid_ds {1struct semid_ds {
2 struct ipc_perm sem_perm;2 struct ipc_perm sem_perm;
3 time_t sem_otime;3 unsigned long __sem_otime_lo;
4 long __unused1;4 unsigned long __sem_otime_hi;
5 time_t sem_ctime;5 unsigned long __sem_ctime_lo;
6 long __unused2;6 unsigned long __sem_ctime_hi;
7#if __BYTE_ORDER == __LITTLE_ENDIAN7#if __BYTE_ORDER == __LITTLE_ENDIAN
8 unsigned short sem_nsems;8 unsigned short sem_nsems;
9 char __sem_nsems_pad[sizeof(long)-sizeof(short)];9 char __sem_nsems_pad[sizeof(long)-sizeof(short)];
...@@ -13,4 +13,6 @@ struct semid_ds {...@@ -13,4 +13,6 @@ struct semid_ds {
13#endif13#endif
14 long __unused3;14 long __unused3;
15 long __unused4;15 long __unused4;
16 time_t sem_otime;
17 time_t sem_ctime;
16};18};
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/shm.h+10-6
...@@ -3,17 +3,21 @@...@@ -3,17 +3,21 @@
3struct shmid_ds {3struct shmid_ds {
4 struct ipc_perm shm_perm;4 struct ipc_perm shm_perm;
5 size_t shm_segsz;5 size_t shm_segsz;
6 time_t shm_atime;6 unsigned long __shm_atime_lo;
7 int __unused1;7 unsigned long __shm_atime_hi;
8 time_t shm_dtime;8 unsigned long __shm_dtime_lo;
9 int __unused2;9 unsigned long __shm_dtime_hi;
10 time_t shm_ctime;10 unsigned long __shm_ctime_lo;
11 int __unused3;11 unsigned long __shm_ctime_hi;
12 pid_t shm_cpid;12 pid_t shm_cpid;
13 pid_t shm_lpid;13 pid_t shm_lpid;
14 unsigned long shm_nattch;14 unsigned long shm_nattch;
15 unsigned long __pad1;15 unsigned long __pad1;
16 unsigned long __pad2;16 unsigned long __pad2;
17 unsigned long __pad3;
18 time_t shm_atime;
19 time_t shm_dtime;
20 time_t shm_ctime;
17};21};
1822
19struct shminfo {23struct shminfo {
lib/libc/include/arm-linux-musl/bits/stat.h+5-1
...@@ -14,8 +14,12 @@ struct stat {...@@ -14,8 +14,12 @@ struct stat {
14 off_t st_size;14 off_t st_size;
15 blksize_t st_blksize;15 blksize_t st_blksize;
16 blkcnt_t st_blocks;16 blkcnt_t st_blocks;
17 struct {
18 long tv_sec;
19 long tv_nsec;
20 } __st_atim32, __st_mtim32, __st_ctim32;
21 ino_t st_ino;
17 struct timespec st_atim;22 struct timespec st_atim;
18 struct timespec st_mtim;23 struct timespec st_mtim;
19 struct timespec st_ctim;24 struct timespec st_ctim;
20 ino_t st_ino;
21};25};
\ No newline at end of file
lib/libc/include/arm-linux-musl/bits/syscall.h+25-21
...@@ -55,8 +55,8 @@...@@ -55,8 +55,8 @@
55#define __NR_sethostname 7455#define __NR_sethostname 74
56#define __NR_setrlimit 7556#define __NR_setrlimit 75
57#define __NR_getrusage 7757#define __NR_getrusage 77
58#define __NR_gettimeofday 7858#define __NR_gettimeofday_time32 78
59#define __NR_settimeofday 7959#define __NR_settimeofday_time32 79
60#define __NR_getgroups 8060#define __NR_getgroups 80
61#define __NR_setgroups 8161#define __NR_setgroups 81
62#define __NR_symlink 8362#define __NR_symlink 83
...@@ -211,14 +211,14 @@...@@ -211,14 +211,14 @@
211#define __NR_remap_file_pages 253211#define __NR_remap_file_pages 253
212#define __NR_set_tid_address 256212#define __NR_set_tid_address 256
213#define __NR_timer_create 257213#define __NR_timer_create 257
214#define __NR_timer_settime 258214#define __NR_timer_settime32 258
215#define __NR_timer_gettime 259215#define __NR_timer_gettime32 259
216#define __NR_timer_getoverrun 260216#define __NR_timer_getoverrun 260
217#define __NR_timer_delete 261217#define __NR_timer_delete 261
218#define __NR_clock_settime 262218#define __NR_clock_settime32 262
219#define __NR_clock_gettime 263219#define __NR_clock_gettime32 263
220#define __NR_clock_getres 264220#define __NR_clock_getres_time32 264
221#define __NR_clock_nanosleep 265221#define __NR_clock_nanosleep_time32 265
222#define __NR_statfs64 266222#define __NR_statfs64 266
223#define __NR_fstatfs64 267223#define __NR_fstatfs64 267
224#define __NR_tgkill 268224#define __NR_tgkill 268
...@@ -308,8 +308,8 @@...@@ -308,8 +308,8 @@
308#define __NR_timerfd_create 350308#define __NR_timerfd_create 350
309#define __NR_eventfd 351309#define __NR_eventfd 351
310#define __NR_fallocate 352310#define __NR_fallocate 352
311#define __NR_timerfd_settime 353311#define __NR_timerfd_settime32 353
312#define __NR_timerfd_gettime 354312#define __NR_timerfd_gettime32 354
313#define __NR_signalfd4 355313#define __NR_signalfd4 355
314#define __NR_eventfd2 356314#define __NR_eventfd2 356
315#define __NR_epoll_create1 357315#define __NR_epoll_create1 357
...@@ -387,6 +387,8 @@...@@ -387,6 +387,8 @@
387#define __NR_fsconfig 431387#define __NR_fsconfig 431
388#define __NR_fsmount 432388#define __NR_fsmount 432
389#define __NR_fspick 433389#define __NR_fspick 433
390#define __NR_pidfd_open 434
391#define __NR_clone3 435
390392
391#define __ARM_NR_breakpoint 0x0f0001393#define __ARM_NR_breakpoint 0x0f0001
392#define __ARM_NR_cacheflush 0x0f0002394#define __ARM_NR_cacheflush 0x0f0002
...@@ -452,8 +454,8 @@...@@ -452,8 +454,8 @@
452#define SYS_sethostname 74454#define SYS_sethostname 74
453#define SYS_setrlimit 75455#define SYS_setrlimit 75
454#define SYS_getrusage 77456#define SYS_getrusage 77
455#define SYS_gettimeofday 78457#define SYS_gettimeofday_time32 78
456#define SYS_settimeofday 79458#define SYS_settimeofday_time32 79
457#define SYS_getgroups 80459#define SYS_getgroups 80
458#define SYS_setgroups 81460#define SYS_setgroups 81
459#define SYS_symlink 83461#define SYS_symlink 83
...@@ -608,14 +610,14 @@...@@ -608,14 +610,14 @@
608#define SYS_remap_file_pages 253610#define SYS_remap_file_pages 253
609#define SYS_set_tid_address 256611#define SYS_set_tid_address 256
610#define SYS_timer_create 257612#define SYS_timer_create 257
611#define SYS_timer_settime 258613#define SYS_timer_settime32 258
612#define SYS_timer_gettime 259614#define SYS_timer_gettime32 259
613#define SYS_timer_getoverrun 260615#define SYS_timer_getoverrun 260
614#define SYS_timer_delete 261616#define SYS_timer_delete 261
615#define SYS_clock_settime 262617#define SYS_clock_settime32 262
616#define SYS_clock_gettime 263618#define SYS_clock_gettime32 263
617#define SYS_clock_getres 264619#define SYS_clock_getres_time32 264
618#define SYS_clock_nanosleep 265620#define SYS_clock_nanosleep_time32 265
619#define SYS_statfs64 266621#define SYS_statfs64 266
620#define SYS_fstatfs64 267622#define SYS_fstatfs64 267
621#define SYS_tgkill 268623#define SYS_tgkill 268
...@@ -705,8 +707,8 @@...@@ -705,8 +707,8 @@
705#define SYS_timerfd_create 350707#define SYS_timerfd_create 350
706#define SYS_eventfd 351708#define SYS_eventfd 351
707#define SYS_fallocate 352709#define SYS_fallocate 352
708#define SYS_timerfd_settime 353710#define SYS_timerfd_settime32 353
709#define SYS_timerfd_gettime 354711#define SYS_timerfd_gettime32 354
710#define SYS_signalfd4 355712#define SYS_signalfd4 355
711#define SYS_eventfd2 356713#define SYS_eventfd2 356
712#define SYS_epoll_create1 357714#define SYS_epoll_create1 357
...@@ -783,4 +785,6 @@...@@ -783,4 +785,6 @@
783#define SYS_fsopen 430785#define SYS_fsopen 430
784#define SYS_fsconfig 431786#define SYS_fsconfig 431
785#define SYS_fsmount 432787#define SYS_fsmount 432
786#define SYS_fspick 433
\ No newline at end of file
788#define SYS_fspick 433
789#define SYS_pidfd_open 434
790#define SYS_clone3 435
\ No newline at end of file
lib/libc/include/generic-musl/aio.h+4
...@@ -62,6 +62,10 @@ int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sige...@@ -62,6 +62,10 @@ int lio_listio(int, struct aiocb *__restrict const *__restrict, int, struct sige
62#define off64_t off_t62#define off64_t off_t
63#endif63#endif
6464
65#if _REDIR_TIME64
66__REDIR(aio_suspend, __aio_suspend_time64);
67#endif
68
65#ifdef __cplusplus69#ifdef __cplusplus
66}70}
67#endif71#endif
lib/libc/include/generic-musl/alloca.h-2
...@@ -10,9 +10,7 @@ extern "C" {...@@ -10,9 +10,7 @@ extern "C" {
1010
11void *alloca(size_t);11void *alloca(size_t);
1212
13#ifdef __GNUC__
14#define alloca __builtin_alloca13#define alloca __builtin_alloca
15#endif
1614
17#ifdef __cplusplus15#ifdef __cplusplus
18}16}
lib/libc/include/generic-musl/arpa/nameser.h-1
...@@ -7,7 +7,6 @@ extern "C" {...@@ -7,7 +7,6 @@ extern "C" {
77
8#include <stddef.h>8#include <stddef.h>
9#include <stdint.h>9#include <stdint.h>
10#include <endian.h>
1110
12#define __NAMESER 1999100611#define __NAMESER 19991006
13#define NS_PACKETSZ 51212#define NS_PACKETSZ 512
lib/libc/include/generic-musl/bits/dirent.h created+11
...@@ -0,0 +1,11 @@
1#define _DIRENT_HAVE_D_RECLEN
2#define _DIRENT_HAVE_D_OFF
3#define _DIRENT_HAVE_D_TYPE
4
5struct dirent {
6 ino_t d_ino;
7 off_t d_off;
8 unsigned short d_reclen;
9 unsigned char d_type;
10 char d_name[256];
11};
\ No newline at end of file
lib/libc/include/generic-musl/bits/endian.h deleted-1
...@@ -1 +0,0 @@
1#define __BYTE_ORDER __LITTLE_ENDIAN
\ No newline at end of file
lib/libc/include/generic-musl/bits/ioctl.h+5
...@@ -104,7 +104,12 @@...@@ -104,7 +104,12 @@
104#define FIOGETOWN 0x8903104#define FIOGETOWN 0x8903
105#define SIOCGPGRP 0x8904105#define SIOCGPGRP 0x8904
106#define SIOCATMARK 0x8905106#define SIOCATMARK 0x8905
107#if __LONG_MAX == 0x7fffffff
108#define SIOCGSTAMP _IOR(0x89, 6, char[16])
109#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])
110#else
107#define SIOCGSTAMP 0x8906111#define SIOCGSTAMP 0x8906
108#define SIOCGSTAMPNS 0x8907112#define SIOCGSTAMPNS 0x8907
113#endif
109114
110#include <bits/ioctl_fix.h>115#include <bits/ioctl_fix.h>
\ No newline at end of file
lib/libc/include/generic-musl/bits/limits.h-7
...@@ -1,7 +0,0 @@...@@ -1,7 +0,0 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define LONG_BIT 64
4#endif
5
6#define LONG_MAX 0x7fffffffffffffffL
7#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
lib/libc/include/generic-musl/bits/socket.h-15
...@@ -1,15 +0,0 @@...@@ -1,15 +0,0 @@
1struct msghdr {
2 void *msg_name;
3 socklen_t msg_namelen;
4 struct iovec *msg_iov;
5 int msg_iovlen;
6 void *msg_control;
7 socklen_t msg_controllen;
8 int msg_flags;
9};
10
11struct cmsghdr {
12 socklen_t cmsg_len;
13 int cmsg_level;
14 int cmsg_type;
15};
\ No newline at end of file
lib/libc/include/generic-musl/dirent.h+2-12
...@@ -15,19 +15,9 @@ extern "C" {...@@ -15,19 +15,9 @@ extern "C" {
1515
16#include <bits/alltypes.h>16#include <bits/alltypes.h>
1717
18typedef struct __dirstream DIR;18#include <bits/dirent.h>
19
20#define _DIRENT_HAVE_D_RECLEN
21#define _DIRENT_HAVE_D_OFF
22#define _DIRENT_HAVE_D_TYPE
2319
24struct dirent {20typedef struct __dirstream DIR;
25 ino_t d_ino;
26 off_t d_off;
27 unsigned short d_reclen;
28 unsigned char d_type;
29 char d_name[256];
30};
3121
32#define d_fileno d_ino22#define d_fileno d_ino
3323
lib/libc/include/generic-musl/dlfcn.h+4
...@@ -35,6 +35,10 @@ int dladdr(const void *, Dl_info *);...@@ -35,6 +35,10 @@ int dladdr(const void *, Dl_info *);
35int dlinfo(void *, int, void *);35int dlinfo(void *, int, void *);
36#endif36#endif
3737
38#if _REDIR_TIME64
39__REDIR(dlsym, __dlsym_time64);
40#endif
41
38#ifdef __cplusplus42#ifdef __cplusplus
39}43}
40#endif44#endif
lib/libc/include/generic-musl/endian.h+21-23
...@@ -3,25 +3,19 @@...@@ -3,25 +3,19 @@
33
4#include <features.h>4#include <features.h>
55
6#define __LITTLE_ENDIAN 12346#define __NEED_uint16_t
7#define __BIG_ENDIAN 43217#define __NEED_uint32_t
8#define __PDP_ENDIAN 34128#define __NEED_uint64_t
99
10#if defined(__GNUC__) && defined(__BYTE_ORDER__)10#include <bits/alltypes.h>
11#define __BYTE_ORDER __BYTE_ORDER__
12#else
13#include <bits/endian.h>
14#endif
1511
16#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)12#define __PDP_ENDIAN 3412
1713
18#define BIG_ENDIAN __BIG_ENDIAN14#define BIG_ENDIAN __BIG_ENDIAN
19#define LITTLE_ENDIAN __LITTLE_ENDIAN15#define LITTLE_ENDIAN __LITTLE_ENDIAN
20#define PDP_ENDIAN __PDP_ENDIAN16#define PDP_ENDIAN __PDP_ENDIAN
21#define BYTE_ORDER __BYTE_ORDER17#define BYTE_ORDER __BYTE_ORDER
2218
23#include <stdint.h>
24
25static __inline uint16_t __bswap16(uint16_t __x)19static __inline uint16_t __bswap16(uint16_t __x)
26{20{
27 return __x<<8 | __x>>8;21 return __x<<8 | __x>>8;
...@@ -40,43 +34,47 @@ static __inline uint64_t __bswap64(uint64_t __x)...@@ -40,43 +34,47 @@ static __inline uint64_t __bswap64(uint64_t __x)
40#if __BYTE_ORDER == __LITTLE_ENDIAN34#if __BYTE_ORDER == __LITTLE_ENDIAN
41#define htobe16(x) __bswap16(x)35#define htobe16(x) __bswap16(x)
42#define be16toh(x) __bswap16(x)36#define be16toh(x) __bswap16(x)
43#define betoh16(x) __bswap16(x)
44#define htobe32(x) __bswap32(x)37#define htobe32(x) __bswap32(x)
45#define be32toh(x) __bswap32(x)38#define be32toh(x) __bswap32(x)
46#define betoh32(x) __bswap32(x)
47#define htobe64(x) __bswap64(x)39#define htobe64(x) __bswap64(x)
48#define be64toh(x) __bswap64(x)40#define be64toh(x) __bswap64(x)
49#define betoh64(x) __bswap64(x)
50#define htole16(x) (uint16_t)(x)41#define htole16(x) (uint16_t)(x)
51#define le16toh(x) (uint16_t)(x)42#define le16toh(x) (uint16_t)(x)
52#define letoh16(x) (uint16_t)(x)
53#define htole32(x) (uint32_t)(x)43#define htole32(x) (uint32_t)(x)
54#define le32toh(x) (uint32_t)(x)44#define le32toh(x) (uint32_t)(x)
55#define letoh32(x) (uint32_t)(x)
56#define htole64(x) (uint64_t)(x)45#define htole64(x) (uint64_t)(x)
57#define le64toh(x) (uint64_t)(x)46#define le64toh(x) (uint64_t)(x)
58#define letoh64(x) (uint64_t)(x)
59#else47#else
60#define htobe16(x) (uint16_t)(x)48#define htobe16(x) (uint16_t)(x)
61#define be16toh(x) (uint16_t)(x)49#define be16toh(x) (uint16_t)(x)
62#define betoh16(x) (uint16_t)(x)
63#define htobe32(x) (uint32_t)(x)50#define htobe32(x) (uint32_t)(x)
64#define be32toh(x) (uint32_t)(x)51#define be32toh(x) (uint32_t)(x)
65#define betoh32(x) (uint32_t)(x)
66#define htobe64(x) (uint64_t)(x)52#define htobe64(x) (uint64_t)(x)
67#define be64toh(x) (uint64_t)(x)53#define be64toh(x) (uint64_t)(x)
68#define betoh64(x) (uint64_t)(x)
69#define htole16(x) __bswap16(x)54#define htole16(x) __bswap16(x)
70#define le16toh(x) __bswap16(x)55#define le16toh(x) __bswap16(x)
71#define letoh16(x) __bswap16(x)
72#define htole32(x) __bswap32(x)56#define htole32(x) __bswap32(x)
73#define le32toh(x) __bswap32(x)57#define le32toh(x) __bswap32(x)
74#define letoh32(x) __bswap32(x)
75#define htole64(x) __bswap64(x)58#define htole64(x) __bswap64(x)
76#define le64toh(x) __bswap64(x)59#define le64toh(x) __bswap64(x)
77#define letoh64(x) __bswap64(x)
78#endif60#endif
7961
62#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
63#if __BYTE_ORDER == __LITTLE_ENDIAN
64#define betoh16(x) __bswap16(x)
65#define betoh32(x) __bswap32(x)
66#define betoh64(x) __bswap64(x)
67#define letoh16(x) (uint16_t)(x)
68#define letoh32(x) (uint32_t)(x)
69#define letoh64(x) (uint64_t)(x)
70#else
71#define betoh16(x) (uint16_t)(x)
72#define betoh32(x) (uint32_t)(x)
73#define betoh64(x) (uint64_t)(x)
74#define letoh16(x) __bswap16(x)
75#define letoh32(x) __bswap32(x)
76#define letoh64(x) __bswap64(x)
77#endif
80#endif78#endif
8179
82#endif80#endif
\ No newline at end of file
lib/libc/include/generic-musl/features.h+2
...@@ -35,4 +35,6 @@...@@ -35,4 +35,6 @@
35#define _Noreturn35#define _Noreturn
36#endif36#endif
3737
38#define __REDIR(x,y) __typeof__(x) x __asm__(#y)
39
38#endif40#endif
\ No newline at end of file
lib/libc/include/generic-musl/limits.h+13-5
...@@ -3,9 +3,7 @@...@@ -3,9 +3,7 @@
33
4#include <features.h>4#include <features.h>
55
6/* Most limits are system-specific */6#include <bits/alltypes.h> /* __LONG_MAX */
7
8#include <bits/limits.h>
97
10/* Support signed or unsigned plain-char */8/* Support signed or unsigned plain-char */
119
...@@ -17,8 +15,6 @@...@@ -17,8 +15,6 @@
17#define CHAR_MAX 12715#define CHAR_MAX 127
18#endif16#endif
1917
20/* Some universal constants... */
21
22#define CHAR_BIT 818#define CHAR_BIT 8
23#define SCHAR_MIN (-128)19#define SCHAR_MIN (-128)
24#define SCHAR_MAX 12720#define SCHAR_MAX 127
...@@ -30,8 +26,10 @@...@@ -30,8 +26,10 @@
30#define INT_MAX 0x7fffffff26#define INT_MAX 0x7fffffff
31#define UINT_MAX 0xffffffffU27#define UINT_MAX 0xffffffffU
32#define LONG_MIN (-LONG_MAX-1)28#define LONG_MIN (-LONG_MAX-1)
29#define LONG_MAX __LONG_MAX
33#define ULONG_MAX (2UL*LONG_MAX+1)30#define ULONG_MAX (2UL*LONG_MAX+1)
34#define LLONG_MIN (-LLONG_MAX-1)31#define LLONG_MIN (-LLONG_MAX-1)
32#define LLONG_MAX 0x7fffffffffffffffLL
35#define ULLONG_MAX (2ULL*LLONG_MAX+1)33#define ULLONG_MAX (2ULL*LLONG_MAX+1)
3634
37#define MB_LEN_MAX 435#define MB_LEN_MAX 4
...@@ -39,9 +37,13 @@...@@ -39,9 +37,13 @@
39#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \37#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
40 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)38 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
4139
40#include <bits/limits.h>
41
42#define PIPE_BUF 409642#define PIPE_BUF 4096
43#define FILESIZEBITS 6443#define FILESIZEBITS 64
44#ifndef NAME_MAX
44#define NAME_MAX 25545#define NAME_MAX 255
46#endif
45#define PATH_MAX 409647#define PATH_MAX 4096
46#define NGROUPS_MAX 3248#define NGROUPS_MAX 32
47#define ARG_MAX 13107249#define ARG_MAX 131072
...@@ -53,6 +55,12 @@...@@ -53,6 +55,12 @@
53#define TTY_NAME_MAX 3255#define TTY_NAME_MAX 32
54#define HOST_NAME_MAX 25556#define HOST_NAME_MAX 255
5557
58#if LONG_MAX == 0x7fffffffL
59#define LONG_BIT 32
60#else
61#define LONG_BIT 64
62#endif
63
56/* Implementation choices... */64/* Implementation choices... */
5765
58#define PTHREAD_KEYS_MAX 12866#define PTHREAD_KEYS_MAX 128
lib/libc/include/generic-musl/mqueue.h+5
...@@ -30,6 +30,11 @@ ssize_t mq_timedreceive(mqd_t, char *__restrict, size_t, unsigned *__restrict, c...@@ -30,6 +30,11 @@ ssize_t mq_timedreceive(mqd_t, char *__restrict, size_t, unsigned *__restrict, c
30int mq_timedsend(mqd_t, const char *, size_t, unsigned, const struct timespec *);30int mq_timedsend(mqd_t, const char *, size_t, unsigned, const struct timespec *);
31int mq_unlink(const char *);31int mq_unlink(const char *);
3232
33#if _REDIR_TIME64
34__REDIR(mq_timedreceive, __mq_timedreceive_time64);
35__REDIR(mq_timedsend, __mq_timedsend_time64);
36#endif
37
33#ifdef __cplusplus38#ifdef __cplusplus
34}39}
35#endif40#endif
lib/libc/include/generic-musl/netinet/icmp6.h-1
...@@ -9,7 +9,6 @@ extern "C" {...@@ -9,7 +9,6 @@ extern "C" {
9#include <string.h>9#include <string.h>
10#include <sys/types.h>10#include <sys/types.h>
11#include <netinet/in.h>11#include <netinet/in.h>
12#include <endian.h>
1312
14#define ICMP6_FILTER 113#define ICMP6_FILTER 1
1514
lib/libc/include/generic-musl/netinet/if_ether.h+1
...@@ -58,6 +58,7 @@...@@ -58,6 +58,7 @@
58#define ETH_P_ERSPAN 0x88BE58#define ETH_P_ERSPAN 0x88BE
59#define ETH_P_PREAUTH 0x88C759#define ETH_P_PREAUTH 0x88C7
60#define ETH_P_TIPC 0x88CA60#define ETH_P_TIPC 0x88CA
61#define ETH_P_LLDP 0x88CC
61#define ETH_P_MACSEC 0x88E562#define ETH_P_MACSEC 0x88E5
62#define ETH_P_8021AH 0x88E763#define ETH_P_8021AH 0x88E7
63#define ETH_P_MVRP 0x88F564#define ETH_P_MVRP 0x88F5
lib/libc/include/generic-musl/netinet/ip.h+2-1
...@@ -7,7 +7,6 @@ extern "C" {...@@ -7,7 +7,6 @@ extern "C" {
77
8#include <stdint.h>8#include <stdint.h>
9#include <netinet/in.h>9#include <netinet/in.h>
10#include <endian.h>
1110
12struct timestamp {11struct timestamp {
13 uint8_t len;12 uint8_t len;
...@@ -191,6 +190,8 @@ struct ip_timestamp {...@@ -191,6 +190,8 @@ struct ip_timestamp {
191190
192#define IP_MSS 576191#define IP_MSS 576
193192
193#define __UAPI_DEF_IPHDR 0
194
194#ifdef __cplusplus195#ifdef __cplusplus
195}196}
196#endif197#endif
lib/libc/include/generic-musl/netinet/ip6.h-1
...@@ -7,7 +7,6 @@ extern "C" {...@@ -7,7 +7,6 @@ extern "C" {
77
8#include <stdint.h>8#include <stdint.h>
9#include <netinet/in.h>9#include <netinet/in.h>
10#include <endian.h>
1110
12struct ip6_hdr {11struct ip6_hdr {
13 union {12 union {
lib/libc/include/generic-musl/netinet/tcp.h+3-1
...@@ -38,6 +38,7 @@...@@ -38,6 +38,7 @@
38#define TCP_FASTOPEN_NO_COOKIE 3438#define TCP_FASTOPEN_NO_COOKIE 34
39#define TCP_ZEROCOPY_RECEIVE 3539#define TCP_ZEROCOPY_RECEIVE 35
40#define TCP_INQ 3640#define TCP_INQ 36
41#define TCP_TX_DELAY 37
4142
42#define TCP_CM_INQ TCP_INQ43#define TCP_CM_INQ TCP_INQ
4344
...@@ -97,7 +98,6 @@ enum {...@@ -97,7 +98,6 @@ enum {
97#include <sys/types.h>98#include <sys/types.h>
98#include <sys/socket.h>99#include <sys/socket.h>
99#include <stdint.h>100#include <stdint.h>
100#include <endian.h>
101101
102typedef uint32_t tcp_seq;102typedef uint32_t tcp_seq;
103103
...@@ -234,6 +234,8 @@ struct tcp_info {...@@ -234,6 +234,8 @@ struct tcp_info {
234 uint64_t tcpi_bytes_retrans;234 uint64_t tcpi_bytes_retrans;
235 uint32_t tcpi_dsack_dups;235 uint32_t tcpi_dsack_dups;
236 uint32_t tcpi_reord_seen;236 uint32_t tcpi_reord_seen;
237 uint32_t tcpi_rcv_ooopack;
238 uint32_t tcpi_snd_wnd;
237};239};
238240
239#define TCP_MD5SIG_MAXKEYLEN 80241#define TCP_MD5SIG_MAXKEYLEN 80
lib/libc/include/generic-musl/poll.h+6
...@@ -44,6 +44,12 @@ int poll (struct pollfd *, nfds_t, int);...@@ -44,6 +44,12 @@ int poll (struct pollfd *, nfds_t, int);
44int ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *);44int ppoll(struct pollfd *, nfds_t, const struct timespec *, const sigset_t *);
45#endif45#endif
4646
47#if _REDIR_TIME64
48#ifdef _GNU_SOURCE
49__REDIR(ppoll, __ppoll_time64);
50#endif
51#endif
52
47#ifdef __cplusplus53#ifdef __cplusplus
48}54}
49#endif55#endif
lib/libc/include/generic-musl/pthread.h+10
...@@ -224,6 +224,16 @@ int pthread_tryjoin_np(pthread_t, void **);...@@ -224,6 +224,16 @@ int pthread_tryjoin_np(pthread_t, void **);
224int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);224int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
225#endif225#endif
226226
227#if _REDIR_TIME64
228__REDIR(pthread_mutex_timedlock, __pthread_mutex_timedlock_time64);
229__REDIR(pthread_cond_timedwait, __pthread_cond_timedwait_time64);
230__REDIR(pthread_rwlock_timedrdlock, __pthread_rwlock_timedrdlock_time64);
231__REDIR(pthread_rwlock_timedwrlock, __pthread_rwlock_timedwrlock_time64);
232#ifdef _GNU_SOURCE
233__REDIR(pthread_timedjoin_np, __pthread_timedjoin_np_time64);
234#endif
235#endif
236
227#ifdef __cplusplus237#ifdef __cplusplus
228}238}
229#endif239#endif
lib/libc/include/generic-musl/sched.h+8
...@@ -19,10 +19,14 @@ extern "C" {...@@ -19,10 +19,14 @@ extern "C" {
19struct sched_param {19struct sched_param {
20 int sched_priority;20 int sched_priority;
21 int __reserved1;21 int __reserved1;
22#if _REDIR_TIME64
23 long __reserved2[4];
24#else
22 struct {25 struct {
23 time_t __reserved1;26 time_t __reserved1;
24 long __reserved2;27 long __reserved2;
25 } __reserved2[2];28 } __reserved2[2];
29#endif
26 int __reserved3;30 int __reserved3;
27};31};
2832
...@@ -133,6 +137,10 @@ __CPU_op_func_S(XOR, ^)...@@ -133,6 +137,10 @@ __CPU_op_func_S(XOR, ^)
133137
134#endif138#endif
135139
140#if _REDIR_TIME64
141__REDIR(sched_rr_get_interval, __sched_rr_get_interval_time64);
142#endif
143
136#ifdef __cplusplus144#ifdef __cplusplus
137}145}
138#endif146#endif
lib/libc/include/generic-musl/semaphore.h+4
...@@ -29,6 +29,10 @@ int sem_trywait(sem_t *);...@@ -29,6 +29,10 @@ int sem_trywait(sem_t *);
29int sem_unlink(const char *);29int sem_unlink(const char *);
30int sem_wait(sem_t *);30int sem_wait(sem_t *);
3131
32#if _REDIR_TIME64
33__REDIR(sem_timedwait, __sem_timedwait_time64);
34#endif
35
32#ifdef __cplusplus36#ifdef __cplusplus
33}37}
34#endif38#endif
lib/libc/include/generic-musl/signal.h+8
...@@ -271,6 +271,14 @@ typedef int sig_atomic_t;...@@ -271,6 +271,14 @@ typedef int sig_atomic_t;
271void (*signal(int, void (*)(int)))(int);271void (*signal(int, void (*)(int)))(int);
272int raise(int);272int raise(int);
273273
274#if _REDIR_TIME64
275#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
276 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
277 || defined(_BSD_SOURCE)
278__REDIR(sigtimedwait, __sigtimedwait_time64);
279#endif
280#endif
281
274#ifdef __cplusplus282#ifdef __cplusplus
275}283}
276#endif284#endif
lib/libc/include/generic-musl/sys/acct.h-1
...@@ -6,7 +6,6 @@ extern "C" {...@@ -6,7 +6,6 @@ extern "C" {
6#endif6#endif
77
8#include <features.h>8#include <features.h>
9#include <endian.h>
10#include <time.h>9#include <time.h>
11#include <stdint.h>10#include <stdint.h>
1211
lib/libc/include/generic-musl/sys/ioctl.h+1
...@@ -4,6 +4,7 @@...@@ -4,6 +4,7 @@
4extern "C" {4extern "C" {
5#endif5#endif
66
7#include <bits/alltypes.h>
7#include <bits/ioctl.h>8#include <bits/ioctl.h>
89
9#define N_TTY 010#define N_TTY 0
lib/libc/include/generic-musl/sys/mman.h+2
...@@ -92,6 +92,8 @@ extern "C" {...@@ -92,6 +92,8 @@ extern "C" {
92#define MADV_DODUMP 1792#define MADV_DODUMP 17
93#define MADV_WIPEONFORK 1893#define MADV_WIPEONFORK 18
94#define MADV_KEEPONFORK 1994#define MADV_KEEPONFORK 19
95#define MADV_COLD 20
96#define MADV_PAGEOUT 21
95#define MADV_HWPOISON 10097#define MADV_HWPOISON 100
96#define MADV_SOFT_OFFLINE 10198#define MADV_SOFT_OFFLINE 101
97#endif99#endif
lib/libc/include/generic-musl/sys/prctl.h+4
...@@ -154,6 +154,10 @@ struct prctl_mm_map {...@@ -154,6 +154,10 @@ struct prctl_mm_map {
154#define PR_PAC_APDBKEY (1UL << 3)154#define PR_PAC_APDBKEY (1UL << 3)
155#define PR_PAC_APGAKEY (1UL << 4)155#define PR_PAC_APGAKEY (1UL << 4)
156156
157#define PR_SET_TAGGED_ADDR_CTRL 55
158#define PR_GET_TAGGED_ADDR_CTRL 56
159#define PR_TAGGED_ADDR_ENABLE (1UL << 0)
160
157int prctl (int, ...);161int prctl (int, ...);
158162
159#ifdef __cplusplus163#ifdef __cplusplus
lib/libc/include/generic-musl/sys/procfs.h+3-4
...@@ -23,10 +23,9 @@ struct elf_prstatus {...@@ -23,10 +23,9 @@ struct elf_prstatus {
23 pid_t pr_ppid;23 pid_t pr_ppid;
24 pid_t pr_pgrp;24 pid_t pr_pgrp;
25 pid_t pr_sid;25 pid_t pr_sid;
26 struct timeval pr_utime;26 struct {
27 struct timeval pr_stime;27 long tv_sec, tv_usec;
28 struct timeval pr_cutime;28 } pr_utime, pr_stime, pr_cutime, pr_cstime;
29 struct timeval pr_cstime;
30 elf_gregset_t pr_reg;29 elf_gregset_t pr_reg;
31 int pr_fpvalid;30 int pr_fpvalid;
32};31};
lib/libc/include/generic-musl/sys/ptrace.h+29
...@@ -41,6 +41,7 @@ extern "C" {...@@ -41,6 +41,7 @@ extern "C" {
41#define PTRACE_SETSIGMASK 0x420b41#define PTRACE_SETSIGMASK 0x420b
42#define PTRACE_SECCOMP_GET_FILTER 0x420c42#define PTRACE_SECCOMP_GET_FILTER 0x420c
43#define PTRACE_SECCOMP_GET_METADATA 0x420d43#define PTRACE_SECCOMP_GET_METADATA 0x420d
44#define PTRACE_GET_SYSCALL_INFO 0x420e
4445
45#define PT_READ_I PTRACE_PEEKTEXT46#define PT_READ_I PTRACE_PEEKTEXT
46#define PT_READ_D PTRACE_PEEKDATA47#define PT_READ_D PTRACE_PEEKDATA
...@@ -88,6 +89,11 @@ extern "C" {...@@ -88,6 +89,11 @@ extern "C" {
8889
89#define PTRACE_PEEKSIGINFO_SHARED 190#define PTRACE_PEEKSIGINFO_SHARED 1
9091
92#define PTRACE_SYSCALL_INFO_NONE 0
93#define PTRACE_SYSCALL_INFO_ENTRY 1
94#define PTRACE_SYSCALL_INFO_EXIT 2
95#define PTRACE_SYSCALL_INFO_SECCOMP 3
96
91#include <bits/ptrace.h>97#include <bits/ptrace.h>
9298
93struct __ptrace_peeksiginfo_args {99struct __ptrace_peeksiginfo_args {
...@@ -101,6 +107,29 @@ struct __ptrace_seccomp_metadata {...@@ -101,6 +107,29 @@ struct __ptrace_seccomp_metadata {
101 uint64_t flags;107 uint64_t flags;
102};108};
103109
110struct __ptrace_syscall_info {
111 uint8_t op;
112 uint8_t __pad[3];
113 uint32_t arch;
114 uint64_t instruction_pointer;
115 uint64_t stack_pointer;
116 union {
117 struct {
118 uint64_t nr;
119 uint64_t args[6];
120 } entry;
121 struct {
122 int64_t rval;
123 uint8_t is_error;
124 } exit;
125 struct {
126 uint64_t nr;
127 uint64_t args[6];
128 uint32_t ret_data;
129 } seccomp;
130 };
131};
132
104long ptrace(int, ...);133long ptrace(int, ...);
105134
106#ifdef __cplusplus135#ifdef __cplusplus
lib/libc/include/generic-musl/sys/resource.h+6-1
...@@ -90,7 +90,8 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);...@@ -90,7 +90,8 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
90#define RLIMIT_MSGQUEUE 1290#define RLIMIT_MSGQUEUE 12
91#define RLIMIT_NICE 1391#define RLIMIT_NICE 13
92#define RLIMIT_RTPRIO 1492#define RLIMIT_RTPRIO 14
93#define RLIMIT_NLIMITS 1593#define RLIMIT_RTTIME 15
94#define RLIMIT_NLIMITS 16
9495
95#define RLIM_NLIMITS RLIMIT_NLIMITS96#define RLIM_NLIMITS RLIMIT_NLIMITS
9697
...@@ -104,6 +105,10 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);...@@ -104,6 +105,10 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
104#define rlim64_t rlim_t105#define rlim64_t rlim_t
105#endif106#endif
106107
108#if _REDIR_TIME64
109__REDIR(getrusage, __getrusage_time64);
110#endif
111
107#ifdef __cplusplus112#ifdef __cplusplus
108}113}
109#endif114#endif
lib/libc/include/generic-musl/sys/select.h+5
...@@ -35,6 +35,11 @@ int pselect (int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict, co...@@ -35,6 +35,11 @@ int pselect (int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict, co
35#define NFDBITS (8*(int)sizeof(long))35#define NFDBITS (8*(int)sizeof(long))
36#endif36#endif
3737
38#if _REDIR_TIME64
39__REDIR(select, __select_time64);
40__REDIR(pselect, __pselect_time64);
41#endif
42
38#ifdef __cplusplus43#ifdef __cplusplus
39}44}
40#endif45#endif
lib/libc/include/generic-musl/sys/sem.h+6-2
...@@ -25,8 +25,6 @@ extern "C" {...@@ -25,8 +25,6 @@ extern "C" {
25#define SETVAL 1625#define SETVAL 16
26#define SETALL 1726#define SETALL 17
2727
28#include <endian.h>
29
30#include <bits/sem.h>28#include <bits/sem.h>
3129
32#define _SEM_SEMUN_UNDEFINED 130#define _SEM_SEMUN_UNDEFINED 1
...@@ -62,6 +60,12 @@ int semop(int, struct sembuf *, size_t);...@@ -62,6 +60,12 @@ int semop(int, struct sembuf *, size_t);
62int semtimedop(int, struct sembuf *, size_t, const struct timespec *);60int semtimedop(int, struct sembuf *, size_t, const struct timespec *);
63#endif61#endif
6462
63#if _REDIR_TIME64
64#ifdef _GNU_SOURCE
65__REDIR(semtimedop, __semtimedop_time64);
66#endif
67#endif
68
65#ifdef __cplusplus69#ifdef __cplusplus
66}70}
67#endif71#endif
lib/libc/include/generic-musl/sys/socket.h+63-6
...@@ -19,6 +19,40 @@ extern "C" {...@@ -19,6 +19,40 @@ extern "C" {
1919
20#include <bits/socket.h>20#include <bits/socket.h>
2121
22struct msghdr {
23 void *msg_name;
24 socklen_t msg_namelen;
25 struct iovec *msg_iov;
26#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
27 int __pad1;
28#endif
29 int msg_iovlen;
30#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
31 int __pad1;
32#endif
33 void *msg_control;
34#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
35 int __pad2;
36#endif
37 socklen_t msg_controllen;
38#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
39 int __pad2;
40#endif
41 int msg_flags;
42};
43
44struct cmsghdr {
45#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __BIG_ENDIAN
46 int __pad1;
47#endif
48 socklen_t cmsg_len;
49#if __LONG_MAX > 0x7fffffff && __BYTE_ORDER == __LITTLE_ENDIAN
50 int __pad1;
51#endif
52 int cmsg_level;
53 int cmsg_type;
54};
55
22#ifdef _GNU_SOURCE56#ifdef _GNU_SOURCE
23struct ucred {57struct ucred {
24 pid_t pid;58 pid_t pid;
...@@ -182,8 +216,6 @@ struct linger {...@@ -182,8 +216,6 @@ struct linger {
182#define SO_PEERCRED 17216#define SO_PEERCRED 17
183#define SO_RCVLOWAT 18217#define SO_RCVLOWAT 18
184#define SO_SNDLOWAT 19218#define SO_SNDLOWAT 19
185#define SO_RCVTIMEO 20
186#define SO_SNDTIMEO 21
187#define SO_ACCEPTCONN 30219#define SO_ACCEPTCONN 30
188#define SO_PEERSEC 31220#define SO_PEERSEC 31
189#define SO_SNDBUFFORCE 32221#define SO_SNDBUFFORCE 32
...@@ -192,6 +224,28 @@ struct linger {...@@ -192,6 +224,28 @@ struct linger {
192#define SO_DOMAIN 39224#define SO_DOMAIN 39
193#endif225#endif
194226
227#ifndef SO_RCVTIMEO
228#if __LONG_MAX == 0x7fffffff
229#define SO_RCVTIMEO 66
230#define SO_SNDTIMEO 67
231#else
232#define SO_RCVTIMEO 20
233#define SO_SNDTIMEO 21
234#endif
235#endif
236
237#ifndef SO_TIMESTAMP
238#if __LONG_MAX == 0x7fffffff
239#define SO_TIMESTAMP 63
240#define SO_TIMESTAMPNS 64
241#define SO_TIMESTAMPING 65
242#else
243#define SO_TIMESTAMP 29
244#define SO_TIMESTAMPNS 35
245#define SO_TIMESTAMPING 37
246#endif
247#endif
248
195#define SO_SECURITY_AUTHENTICATION 22249#define SO_SECURITY_AUTHENTICATION 22
196#define SO_SECURITY_ENCRYPTION_TRANSPORT 23250#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
197#define SO_SECURITY_ENCRYPTION_NETWORK 24251#define SO_SECURITY_ENCRYPTION_NETWORK 24
...@@ -203,14 +257,10 @@ struct linger {...@@ -203,14 +257,10 @@ struct linger {
203#define SO_GET_FILTER SO_ATTACH_FILTER257#define SO_GET_FILTER SO_ATTACH_FILTER
204258
205#define SO_PEERNAME 28259#define SO_PEERNAME 28
206#define SO_TIMESTAMP 29
207#define SCM_TIMESTAMP SO_TIMESTAMP260#define SCM_TIMESTAMP SO_TIMESTAMP
208
209#define SO_PASSSEC 34261#define SO_PASSSEC 34
210#define SO_TIMESTAMPNS 35
211#define SCM_TIMESTAMPNS SO_TIMESTAMPNS262#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
212#define SO_MARK 36263#define SO_MARK 36
213#define SO_TIMESTAMPING 37
214#define SCM_TIMESTAMPING SO_TIMESTAMPING264#define SCM_TIMESTAMPING SO_TIMESTAMPING
215#define SO_RXQ_OVFL 40265#define SO_RXQ_OVFL 40
216#define SO_WIFI_STATUS 41266#define SO_WIFI_STATUS 41
...@@ -238,6 +288,7 @@ struct linger {...@@ -238,6 +288,7 @@ struct linger {
238#define SO_TXTIME 61288#define SO_TXTIME 61
239#define SCM_TXTIME SO_TXTIME289#define SCM_TXTIME SO_TXTIME
240#define SO_BINDTOIFINDEX 62290#define SO_BINDTOIFINDEX 62
291#define SO_DETACH_REUSEPORT_BPF 68
241292
242#ifndef SOL_SOCKET293#ifndef SOL_SOCKET
243#define SOL_SOCKET 1294#define SOL_SOCKET 1
...@@ -350,6 +401,12 @@ int setsockopt (int, int, int, const void *, socklen_t);...@@ -350,6 +401,12 @@ int setsockopt (int, int, int, const void *, socklen_t);
350401
351int sockatmark (int);402int sockatmark (int);
352403
404#if _REDIR_TIME64
405#ifdef _GNU_SOURCE
406__REDIR(recvmmsg, __recvmmsg_time64);
407#endif
408#endif
409
353#ifdef __cplusplus410#ifdef __cplusplus
354}411}
355#endif412#endif
lib/libc/include/generic-musl/sys/stat.h+9
...@@ -110,6 +110,15 @@ int lchmod(const char *, mode_t);...@@ -110,6 +110,15 @@ int lchmod(const char *, mode_t);
110#define off64_t off_t110#define off64_t off_t
111#endif111#endif
112112
113#if _REDIR_TIME64
114__REDIR(stat, __stat_time64);
115__REDIR(fstat, __fstat_time64);
116__REDIR(lstat, __lstat_time64);
117__REDIR(fstatat, __fstatat_time64);
118__REDIR(futimens, __futimens_time64);
119__REDIR(utimensat, __utimensat_time64);
120#endif
121
113#ifdef __cplusplus122#ifdef __cplusplus
114}123}
115#endif124#endif
lib/libc/include/generic-musl/sys/statvfs.h-2
...@@ -11,8 +11,6 @@ extern "C" {...@@ -11,8 +11,6 @@ extern "C" {
11#define __NEED_fsfilcnt_t11#define __NEED_fsfilcnt_t
12#include <bits/alltypes.h>12#include <bits/alltypes.h>
1313
14#include <endian.h>
15
16struct statvfs {14struct statvfs {
17 unsigned long f_bsize, f_frsize;15 unsigned long f_bsize, f_frsize;
18 fsblkcnt_t f_blocks, f_bfree, f_bavail;16 fsblkcnt_t f_blocks, f_bfree, f_bavail;
lib/libc/include/generic-musl/sys/time.h+14
...@@ -56,6 +56,20 @@ int adjtime (const struct timeval *, struct timeval *);...@@ -56,6 +56,20 @@ int adjtime (const struct timeval *, struct timeval *);
56 (void)0 )56 (void)0 )
57#endif57#endif
5858
59#if _REDIR_TIME64
60__REDIR(gettimeofday, __gettimeofday_time64);
61__REDIR(getitimer, __getitimer_time64);
62__REDIR(setitimer, __setitimer_time64);
63__REDIR(utimes, __utimes_time64);
64#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
65__REDIR(futimes, __futimes_time64);
66__REDIR(futimesat, __futimesat_time64);
67__REDIR(lutimes, __lutimes_time64);
68__REDIR(settimeofday, __settimeofday_time64);
69__REDIR(adjtime, __adjtime64);
70#endif
71#endif
72
59#ifdef __cplusplus73#ifdef __cplusplus
60}74}
61#endif75#endif
lib/libc/include/generic-musl/sys/timeb.h+6
...@@ -4,6 +4,8 @@...@@ -4,6 +4,8 @@
4extern "C" {4extern "C" {
5#endif5#endif
66
7#include <features.h>
8
7#define __NEED_time_t9#define __NEED_time_t
810
9#include <bits/alltypes.h>11#include <bits/alltypes.h>
...@@ -16,6 +18,10 @@ struct timeb {...@@ -16,6 +18,10 @@ struct timeb {
1618
17int ftime(struct timeb *);19int ftime(struct timeb *);
1820
21#if _REDIR_TIME64
22__REDIR(ftime, __ftime64);
23#endif
24
19#ifdef __cplusplus25#ifdef __cplusplus
20}26}
21#endif27#endif
lib/libc/include/generic-musl/sys/timerfd.h+5
...@@ -20,6 +20,11 @@ int timerfd_create(int, int);...@@ -20,6 +20,11 @@ int timerfd_create(int, int);
20int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *);20int timerfd_settime(int, int, const struct itimerspec *, struct itimerspec *);
21int timerfd_gettime(int, struct itimerspec *);21int timerfd_gettime(int, struct itimerspec *);
2222
23#if _REDIR_TIME64
24__REDIR(timerfd_settime, __timerfd_settime64);
25__REDIR(timerfd_gettime, __timerfd_gettime64);
26#endif
27
23#ifdef __cplusplus28#ifdef __cplusplus
24}29}
25#endif30#endif
lib/libc/include/generic-musl/sys/timex.h+5
...@@ -91,6 +91,11 @@ struct timex {...@@ -91,6 +91,11 @@ struct timex {
91int adjtimex(struct timex *);91int adjtimex(struct timex *);
92int clock_adjtime(clockid_t, struct timex *);92int clock_adjtime(clockid_t, struct timex *);
9393
94#if _REDIR_TIME64
95__REDIR(adjtimex, __adjtimex_time64);
96__REDIR(clock_adjtime, __clock_adjtime64);
97#endif
98
94#ifdef __cplusplus99#ifdef __cplusplus
95}100}
96#endif101#endif
lib/libc/include/generic-musl/sys/ttydefaults.h+1-6
...@@ -6,16 +6,11 @@...@@ -6,16 +6,11 @@
6#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)6#define TTYDEF_LFLAG (ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
7#define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL)7#define TTYDEF_CFLAG (CREAD | CS7 | PARENB | HUPCL)
8#define TTYDEF_SPEED (B9600)8#define TTYDEF_SPEED (B9600)
9#define CTRL(x) (x&037)9#define CTRL(x) ((x)&037)
10#define CEOF CTRL('d')10#define CEOF CTRL('d')
1111
12#ifdef _POSIX_VDISABLE
13#define CEOL _POSIX_VDISABLE
14#define CSTATUS _POSIX_VDISABLE
15#else
16#define CEOL '\0'12#define CEOL '\0'
17#define CSTATUS '\0'13#define CSTATUS '\0'
18#endif
1914
20#define CERASE 017715#define CERASE 0177
21#define CINTR CTRL('c')16#define CINTR CTRL('c')
lib/libc/include/generic-musl/sys/wait.h+9-1
...@@ -13,7 +13,8 @@ extern "C" {...@@ -13,7 +13,8 @@ extern "C" {
13typedef enum {13typedef enum {
14 P_ALL = 0,14 P_ALL = 0,
15 P_PID = 1,15 P_PID = 1,
16 P_PGID = 216 P_PGID = 2,
17 P_PIDFD = 3
17} idtype_t;18} idtype_t;
1819
19pid_t wait (int *);20pid_t wait (int *);
...@@ -53,6 +54,13 @@ pid_t wait4 (pid_t, int *, int, struct rusage *);...@@ -53,6 +54,13 @@ pid_t wait4 (pid_t, int *, int, struct rusage *);
53#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)54#define WIFSIGNALED(s) (((s)&0xffff)-1U < 0xffu)
54#define WIFCONTINUED(s) ((s) == 0xffff)55#define WIFCONTINUED(s) ((s) == 0xffff)
5556
57#if _REDIR_TIME64
58#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
59__REDIR(wait3, __wait3_time64);
60__REDIR(wait4, __wait4_time64);
61#endif
62#endif
63
56#ifdef __cplusplus64#ifdef __cplusplus
57}65}
58#endif66#endif
lib/libc/include/generic-musl/threads.h+6
...@@ -80,6 +80,12 @@ void tss_delete(tss_t);...@@ -80,6 +80,12 @@ void tss_delete(tss_t);
80int tss_set(tss_t, void *);80int tss_set(tss_t, void *);
81void *tss_get(tss_t);81void *tss_get(tss_t);
8282
83#if _REDIR_TIME64
84__REDIR(thrd_sleep, __thrd_sleep_time64);
85__REDIR(mtx_timedlock, __mtx_timedlock_time64);
86__REDIR(cnd_timedwait, __cnd_timedwait_time64);
87#endif
88
83#ifdef __cplusplus89#ifdef __cplusplus
84}90}
85#endif91#endif
lib/libc/include/generic-musl/time.h+28
...@@ -130,6 +130,34 @@ int stime(const time_t *);...@@ -130,6 +130,34 @@ int stime(const time_t *);
130time_t timegm(struct tm *);130time_t timegm(struct tm *);
131#endif131#endif
132132
133#if _REDIR_TIME64
134__REDIR(time, __time64);
135__REDIR(difftime, __difftime64);
136__REDIR(mktime, __mktime64);
137__REDIR(gmtime, __gmtime64);
138__REDIR(localtime, __localtime64);
139__REDIR(ctime, __ctime64);
140__REDIR(timespec_get, __timespec_get_time64);
141#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
142 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \
143 || defined(_BSD_SOURCE)
144__REDIR(gmtime_r, __gmtime64_r);
145__REDIR(localtime_r, __localtime64_r);
146__REDIR(ctime_r, __ctime64_r);
147__REDIR(nanosleep, __nanosleep_time64);
148__REDIR(clock_getres, __clock_getres_time64);
149__REDIR(clock_gettime, __clock_gettime64);
150__REDIR(clock_settime, __clock_settime64);
151__REDIR(clock_nanosleep, __clock_nanosleep_time64);
152__REDIR(timer_settime, __timer_settime64);
153__REDIR(timer_gettime, __timer_gettime64);
154#endif
155#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
156__REDIR(stime, __stime64);
157__REDIR(timegm, __timegm_time64);
158#endif
159#endif
160
133#ifdef __cplusplus161#ifdef __cplusplus
134}162}
135#endif163#endif
lib/libc/include/generic-musl/utime.h+6
...@@ -5,6 +5,8 @@...@@ -5,6 +5,8 @@
5extern "C" {5extern "C" {
6#endif6#endif
77
8#include <features.h>
9
8#define __NEED_time_t10#define __NEED_time_t
911
10#include <bits/alltypes.h>12#include <bits/alltypes.h>
...@@ -16,6 +18,10 @@ struct utimbuf {...@@ -16,6 +18,10 @@ struct utimbuf {
1618
17int utime (const char *, const struct utimbuf *);19int utime (const char *, const struct utimbuf *);
1820
21#if _REDIR_TIME64
22__REDIR(utime, __utime64);
23#endif
24
19#ifdef __cplusplus25#ifdef __cplusplus
20}26}
21#endif27#endif
lib/libc/include/generic-musl/utmpx.h+6-1
...@@ -16,6 +16,7 @@ extern "C" {...@@ -16,6 +16,7 @@ extern "C" {
1616
17struct utmpx {17struct utmpx {
18 short ut_type;18 short ut_type;
19 short __ut_pad1;
19 pid_t ut_pid;20 pid_t ut_pid;
20 char ut_line[32];21 char ut_line[32];
21 char ut_id[4];22 char ut_id[4];
...@@ -25,7 +26,11 @@ struct utmpx {...@@ -25,7 +26,11 @@ struct utmpx {
25 short __e_termination;26 short __e_termination;
26 short __e_exit;27 short __e_exit;
27 } ut_exit;28 } ut_exit;
28 long ut_session;29#if __BYTE_ORDER == 1234
30 int ut_session, __ut_pad2;
31#else
32 int __ut_pad2, ut_session;
33#endif
29 struct timeval ut_tv;34 struct timeval ut_tv;
30 unsigned ut_addr_v6[4];35 unsigned ut_addr_v6[4];
31 char __unused[20];36 char __unused[20];
lib/libc/include/i386-linux-musl/bits/alltypes.h+64-70
...@@ -1,30 +1,10 @@...@@ -1,30 +1,10 @@
1#define _REDIR_TIME64 1
1#define _Addr int2#define _Addr int
2#define _Int64 long long3#define _Int64 long long
3#define _Reg int4#define _Reg int
45
5#if __GNUC__ >= 36#define __BYTE_ORDER 1234
6#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)7#define __LONG_MAX 0x7fffffffL
7typedef __builtin_va_list va_list;
8#define __DEFINED_va_list
9#endif
10
11#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
12typedef __builtin_va_list __isoc_va_list;
13#define __DEFINED___isoc_va_list
14#endif
15
16#else
17#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
18typedef struct __va_list * va_list;
19#define __DEFINED_va_list
20#endif
21
22#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
23typedef struct __va_list * __isoc_va_list;
24#define __DEFINED___isoc_va_list
25#endif
26
27#endif
288
29#ifndef __cplusplus9#ifndef __cplusplus
30#ifdef __WCHAR_TYPE__10#ifdef __WCHAR_TYPE__
...@@ -85,52 +65,9 @@ typedef struct { alignas(8) long long __ll; long double __ld; } max_align_t;...@@ -85,52 +65,9 @@ typedef struct { alignas(8) long long __ll; long double __ld; } max_align_t;
85#endif65#endif
8666
87#endif67#endif
8868#define __LITTLE_ENDIAN 1234
89#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)69#define __BIG_ENDIAN 4321
90typedef long time_t;70#define __USE_TIME_BITS64 1
91#define __DEFINED_time_t
92#endif
93
94#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
95typedef long suseconds_t;
96#define __DEFINED_suseconds_t
97#endif
98
99
100#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
101typedef struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
102#define __DEFINED_pthread_attr_t
103#endif
104
105#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
106typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
107#define __DEFINED_pthread_mutex_t
108#endif
109
110#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
111typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
112#define __DEFINED_mtx_t
113#endif
114
115#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
116typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
117#define __DEFINED_pthread_cond_t
118#endif
119
120#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
121typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
122#define __DEFINED_cnd_t
123#endif
124
125#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
126typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
127#define __DEFINED_pthread_rwlock_t
128#endif
129
130#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
131typedef struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
132#define __DEFINED_pthread_barrier_t
133#endif
13471
135#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)72#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
136typedef unsigned _Addr size_t;73typedef unsigned _Addr size_t;
...@@ -167,6 +104,16 @@ typedef _Reg register_t;...@@ -167,6 +104,16 @@ typedef _Reg register_t;
167#define __DEFINED_register_t104#define __DEFINED_register_t
168#endif105#endif
169106
107#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
108typedef _Int64 time_t;
109#define __DEFINED_time_t
110#endif
111
112#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
113typedef _Int64 suseconds_t;
114#define __DEFINED_suseconds_t
115#endif
116
170117
171#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)118#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
172typedef signed char int8_t;119typedef signed char int8_t;
...@@ -302,7 +249,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -302,7 +249,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
302#endif249#endif
303250
304#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)251#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
305struct timespec { time_t tv_sec; long tv_nsec; };252struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
306#define __DEFINED_struct_timespec253#define __DEFINED_struct_timespec
307#endif254#endif
308255
...@@ -398,6 +345,17 @@ typedef struct _IO_FILE FILE;...@@ -398,6 +345,17 @@ typedef struct _IO_FILE FILE;
398#endif345#endif
399346
400347
348#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
349typedef __builtin_va_list va_list;
350#define __DEFINED_va_list
351#endif
352
353#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
354typedef __builtin_va_list __isoc_va_list;
355#define __DEFINED___isoc_va_list
356#endif
357
358
401#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)359#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
402typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;360typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
403#define __DEFINED_mbstate_t361#define __DEFINED_mbstate_t
...@@ -433,6 +391,42 @@ typedef unsigned short sa_family_t;...@@ -433,6 +391,42 @@ typedef unsigned short sa_family_t;
433#endif391#endif
434392
435393
394#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
395typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
396#define __DEFINED_pthread_attr_t
397#endif
398
399#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
400typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
401#define __DEFINED_pthread_mutex_t
402#endif
403
404#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
405typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
406#define __DEFINED_mtx_t
407#endif
408
409#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
410typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
411#define __DEFINED_pthread_cond_t
412#endif
413
414#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
415typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
416#define __DEFINED_cnd_t
417#endif
418
419#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
420typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
421#define __DEFINED_pthread_rwlock_t
422#endif
423
424#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
425typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
426#define __DEFINED_pthread_barrier_t
427#endif
428
429
436#undef _Addr430#undef _Addr
437#undef _Int64431#undef _Int64
438#undef _Reg432#undef _Reg
\ No newline at end of file
lib/libc/include/i386-linux-musl/bits/ipcstat.h created+1
...@@ -0,0 +1 @@
1#define IPC_STAT 0x102
\ No newline at end of file
lib/libc/include/i386-linux-musl/bits/limits.h+1-8
...@@ -1,8 +1 @@...@@ -1,8 +1 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define PAGESIZE 4096
4#define LONG_BIT 32
5#endif
6
7#define LONG_MAX 0x7fffffffL
8#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
1#define PAGESIZE 4096
\ No newline at end of file
lib/libc/include/i386-linux-musl/bits/msg.h+9-6
...@@ -1,15 +1,18 @@...@@ -1,15 +1,18 @@
1struct msqid_ds {1struct msqid_ds {
2 struct ipc_perm msg_perm;2 struct ipc_perm msg_perm;
3 time_t msg_stime;3 unsigned long __msg_stime_lo;
4 int __unused1;4 unsigned long __msg_stime_hi;
5 time_t msg_rtime;5 unsigned long __msg_rtime_lo;
6 int __unused2;6 unsigned long __msg_rtime_hi;
7 time_t msg_ctime;7 unsigned long __msg_ctime_lo;
8 int __unused3;8 unsigned long __msg_ctime_hi;
9 unsigned long msg_cbytes;9 unsigned long msg_cbytes;
10 msgqnum_t msg_qnum;10 msgqnum_t msg_qnum;
11 msglen_t msg_qbytes;11 msglen_t msg_qbytes;
12 pid_t msg_lspid;12 pid_t msg_lspid;
13 pid_t msg_lrpid;13 pid_t msg_lrpid;
14 unsigned long __unused[2];14 unsigned long __unused[2];
15 time_t msg_stime;
16 time_t msg_rtime;
17 time_t msg_ctime;
15};18};
\ No newline at end of file
lib/libc/include/i386-linux-musl/bits/sem.h+6-4
...@@ -1,11 +1,13 @@...@@ -1,11 +1,13 @@
1struct semid_ds {1struct semid_ds {
2 struct ipc_perm sem_perm;2 struct ipc_perm sem_perm;
3 time_t sem_otime;3 unsigned long __sem_otime_lo;
4 long __unused1;4 unsigned long __sem_otime_hi;
5 time_t sem_ctime;5 unsigned long __sem_ctime_lo;
6 long __unused2;6 unsigned long __sem_ctime_hi;
7 unsigned short sem_nsems;7 unsigned short sem_nsems;
8 char __sem_nsems_pad[sizeof(long)-sizeof(short)];8 char __sem_nsems_pad[sizeof(long)-sizeof(short)];
9 long __unused3;9 long __unused3;
10 long __unused4;10 long __unused4;
11 time_t sem_otime;
12 time_t sem_ctime;
11};13};
\ No newline at end of file
lib/libc/include/i386-linux-musl/bits/shm.h+10-6
...@@ -3,17 +3,21 @@...@@ -3,17 +3,21 @@
3struct shmid_ds {3struct shmid_ds {
4 struct ipc_perm shm_perm;4 struct ipc_perm shm_perm;
5 size_t shm_segsz;5 size_t shm_segsz;
6 time_t shm_atime;6 unsigned long __shm_atime_lo;
7 int __unused1;7 unsigned long __shm_atime_hi;
8 time_t shm_dtime;8 unsigned long __shm_dtime_lo;
9 int __unused2;9 unsigned long __shm_dtime_hi;
10 time_t shm_ctime;10 unsigned long __shm_ctime_lo;
11 int __unused3;11 unsigned long __shm_ctime_hi;
12 pid_t shm_cpid;12 pid_t shm_cpid;
13 pid_t shm_lpid;13 pid_t shm_lpid;
14 unsigned long shm_nattch;14 unsigned long shm_nattch;
15 unsigned long __pad1;15 unsigned long __pad1;
16 unsigned long __pad2;16 unsigned long __pad2;
17 unsigned long __pad3;
18 time_t shm_atime;
19 time_t shm_dtime;
20 time_t shm_ctime;
17};21};
1822
19struct shminfo {23struct shminfo {
lib/libc/include/i386-linux-musl/bits/stat.h+5-1
...@@ -14,8 +14,12 @@ struct stat {...@@ -14,8 +14,12 @@ struct stat {
14 off_t st_size;14 off_t st_size;
15 blksize_t st_blksize;15 blksize_t st_blksize;
16 blkcnt_t st_blocks;16 blkcnt_t st_blocks;
17 struct {
18 long tv_sec;
19 long tv_nsec;
20 } __st_atim32, __st_mtim32, __st_ctim32;
21 ino_t st_ino;
17 struct timespec st_atim;22 struct timespec st_atim;
18 struct timespec st_mtim;23 struct timespec st_mtim;
19 struct timespec st_ctim;24 struct timespec st_ctim;
20 ino_t st_ino;
21};25};
\ No newline at end of file
lib/libc/include/i386-linux-musl/bits/syscall.h+25-21
...@@ -76,8 +76,8 @@...@@ -76,8 +76,8 @@
76#define __NR_setrlimit 7576#define __NR_setrlimit 75
77#define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */77#define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */
78#define __NR_getrusage 7778#define __NR_getrusage 77
79#define __NR_gettimeofday 7879#define __NR_gettimeofday_time32 78
80#define __NR_settimeofday 7980#define __NR_settimeofday_time32 79
81#define __NR_getgroups 8081#define __NR_getgroups 80
82#define __NR_setgroups 8182#define __NR_setgroups 81
83#define __NR_select 8283#define __NR_select 82
...@@ -257,14 +257,14 @@...@@ -257,14 +257,14 @@
257#define __NR_remap_file_pages 257257#define __NR_remap_file_pages 257
258#define __NR_set_tid_address 258258#define __NR_set_tid_address 258
259#define __NR_timer_create 259259#define __NR_timer_create 259
260#define __NR_timer_settime (__NR_timer_create+1)260#define __NR_timer_settime32 (__NR_timer_create+1)
261#define __NR_timer_gettime (__NR_timer_create+2)261#define __NR_timer_gettime32 (__NR_timer_create+2)
262#define __NR_timer_getoverrun (__NR_timer_create+3)262#define __NR_timer_getoverrun (__NR_timer_create+3)
263#define __NR_timer_delete (__NR_timer_create+4)263#define __NR_timer_delete (__NR_timer_create+4)
264#define __NR_clock_settime (__NR_timer_create+5)264#define __NR_clock_settime32 (__NR_timer_create+5)
265#define __NR_clock_gettime (__NR_timer_create+6)265#define __NR_clock_gettime32 (__NR_timer_create+6)
266#define __NR_clock_getres (__NR_timer_create+7)266#define __NR_clock_getres_time32 (__NR_timer_create+7)
267#define __NR_clock_nanosleep (__NR_timer_create+8)267#define __NR_clock_nanosleep_time32 (__NR_timer_create+8)
268#define __NR_statfs64 268268#define __NR_statfs64 268
269#define __NR_fstatfs64 269269#define __NR_fstatfs64 269
270#define __NR_tgkill 270270#define __NR_tgkill 270
...@@ -322,8 +322,8 @@...@@ -322,8 +322,8 @@
322#define __NR_timerfd_create 322322#define __NR_timerfd_create 322
323#define __NR_eventfd 323323#define __NR_eventfd 323
324#define __NR_fallocate 324324#define __NR_fallocate 324
325#define __NR_timerfd_settime 325325#define __NR_timerfd_settime32 325
326#define __NR_timerfd_gettime 326326#define __NR_timerfd_gettime32 326
327#define __NR_signalfd4 327327#define __NR_signalfd4 327
328#define __NR_eventfd2 328328#define __NR_eventfd2 328
329#define __NR_epoll_create1 329329#define __NR_epoll_create1 329
...@@ -424,6 +424,8 @@...@@ -424,6 +424,8 @@
424#define __NR_fsconfig 431424#define __NR_fsconfig 431
425#define __NR_fsmount 432425#define __NR_fsmount 432
426#define __NR_fspick 433426#define __NR_fspick 433
427#define __NR_pidfd_open 434
428#define __NR_clone3 435
427429
428#define SYS_restart_syscall 0430#define SYS_restart_syscall 0
429#define SYS_exit 1431#define SYS_exit 1
...@@ -503,8 +505,8 @@...@@ -503,8 +505,8 @@
503#define SYS_setrlimit 75505#define SYS_setrlimit 75
504#define SYS_getrlimit 76 /* Back compatible 2Gig limited rlimit */506#define SYS_getrlimit 76 /* Back compatible 2Gig limited rlimit */
505#define SYS_getrusage 77507#define SYS_getrusage 77
506#define SYS_gettimeofday 78508#define SYS_gettimeofday_time32 78
507#define SYS_settimeofday 79509#define SYS_settimeofday_time32 79
508#define SYS_getgroups 80510#define SYS_getgroups 80
509#define SYS_setgroups 81511#define SYS_setgroups 81
510#define SYS_select 82512#define SYS_select 82
...@@ -682,14 +684,14 @@...@@ -682,14 +684,14 @@
682#define SYS_remap_file_pages 257684#define SYS_remap_file_pages 257
683#define SYS_set_tid_address 258685#define SYS_set_tid_address 258
684#define SYS_timer_create 259686#define SYS_timer_create 259
685#define SYS_timer_settime (__NR_timer_create+1)687#define SYS_timer_settime32 (__NR_timer_create+1)
686#define SYS_timer_gettime (__NR_timer_create+2)688#define SYS_timer_gettime32 (__NR_timer_create+2)
687#define SYS_timer_getoverrun (__NR_timer_create+3)689#define SYS_timer_getoverrun (__NR_timer_create+3)
688#define SYS_timer_delete (__NR_timer_create+4)690#define SYS_timer_delete (__NR_timer_create+4)
689#define SYS_clock_settime (__NR_timer_create+5)691#define SYS_clock_settime32 (__NR_timer_create+5)
690#define SYS_clock_gettime (__NR_timer_create+6)692#define SYS_clock_gettime32 (__NR_timer_create+6)
691#define SYS_clock_getres (__NR_timer_create+7)693#define SYS_clock_getres_time32 (__NR_timer_create+7)
692#define SYS_clock_nanosleep (__NR_timer_create+8)694#define SYS_clock_nanosleep_time32 (__NR_timer_create+8)
693#define SYS_statfs64 268695#define SYS_statfs64 268
694#define SYS_fstatfs64 269696#define SYS_fstatfs64 269
695#define SYS_tgkill 270697#define SYS_tgkill 270
...@@ -747,8 +749,8 @@...@@ -747,8 +749,8 @@
747#define SYS_timerfd_create 322749#define SYS_timerfd_create 322
748#define SYS_eventfd 323750#define SYS_eventfd 323
749#define SYS_fallocate 324751#define SYS_fallocate 324
750#define SYS_timerfd_settime 325752#define SYS_timerfd_settime32 325
751#define SYS_timerfd_gettime 326753#define SYS_timerfd_gettime32 326
752#define SYS_signalfd4 327754#define SYS_signalfd4 327
753#define SYS_eventfd2 328755#define SYS_eventfd2 328
754#define SYS_epoll_create1 329756#define SYS_epoll_create1 329
...@@ -848,4 +850,6 @@...@@ -848,4 +850,6 @@
848#define SYS_fsopen 430850#define SYS_fsopen 430
849#define SYS_fsconfig 431851#define SYS_fsconfig 431
850#define SYS_fsmount 432852#define SYS_fsmount 432
851#define SYS_fspick 433
\ No newline at end of file
853#define SYS_fspick 433
854#define SYS_pidfd_open 434
855#define SYS_clone3 435
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/alltypes.h+67-55
...@@ -1,17 +1,15 @@...@@ -1,17 +1,15 @@
1#define _REDIR_TIME64 1
1#define _Addr int2#define _Addr int
2#define _Int64 long long3#define _Int64 long long
3#define _Reg int4#define _Reg int
45
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)6#if _MIPSEL || __MIPSEL || __MIPSEL__
6typedef __builtin_va_list va_list;7#define __BYTE_ORDER 1234
7#define __DEFINED_va_list8#else
8#endif9#define __BYTE_ORDER 4321
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif10#endif
1411
12#define __LONG_MAX 0x7fffffffL
1513
16#ifndef __cplusplus14#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)15#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -37,52 +35,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -37,52 +35,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
37#define __DEFINED_max_align_t35#define __DEFINED_max_align_t
38#endif36#endif
3937
4038#define __LITTLE_ENDIAN 1234
41#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)39#define __BIG_ENDIAN 4321
42typedef long time_t;40#define __USE_TIME_BITS64 1
43#define __DEFINED_time_t
44#endif
45
46#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
47typedef long suseconds_t;
48#define __DEFINED_suseconds_t
49#endif
50
51
52#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
53typedef struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
54#define __DEFINED_pthread_attr_t
55#endif
56
57#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
58typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
59#define __DEFINED_pthread_mutex_t
60#endif
61
62#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
63typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
64#define __DEFINED_mtx_t
65#endif
66
67#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
68typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
69#define __DEFINED_pthread_cond_t
70#endif
71
72#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
73typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
74#define __DEFINED_cnd_t
75#endif
76
77#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
78typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
79#define __DEFINED_pthread_rwlock_t
80#endif
81
82#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
83typedef struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
84#define __DEFINED_pthread_barrier_t
85#endif
8641
87#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)42#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
88typedef unsigned _Addr size_t;43typedef unsigned _Addr size_t;
...@@ -119,6 +74,16 @@ typedef _Reg register_t;...@@ -119,6 +74,16 @@ typedef _Reg register_t;
119#define __DEFINED_register_t74#define __DEFINED_register_t
120#endif75#endif
12176
77#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
78typedef _Int64 time_t;
79#define __DEFINED_time_t
80#endif
81
82#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
83typedef _Int64 suseconds_t;
84#define __DEFINED_suseconds_t
85#endif
86
12287
123#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)88#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
124typedef signed char int8_t;89typedef signed char int8_t;
...@@ -254,7 +219,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -254,7 +219,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
254#endif219#endif
255220
256#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)221#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
257struct timespec { time_t tv_sec; long tv_nsec; };222struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
258#define __DEFINED_struct_timespec223#define __DEFINED_struct_timespec
259#endif224#endif
260225
...@@ -350,6 +315,17 @@ typedef struct _IO_FILE FILE;...@@ -350,6 +315,17 @@ typedef struct _IO_FILE FILE;
350#endif315#endif
351316
352317
318#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
319typedef __builtin_va_list va_list;
320#define __DEFINED_va_list
321#endif
322
323#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
324typedef __builtin_va_list __isoc_va_list;
325#define __DEFINED___isoc_va_list
326#endif
327
328
353#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)329#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
354typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;330typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
355#define __DEFINED_mbstate_t331#define __DEFINED_mbstate_t
...@@ -385,6 +361,42 @@ typedef unsigned short sa_family_t;...@@ -385,6 +361,42 @@ typedef unsigned short sa_family_t;
385#endif361#endif
386362
387363
364#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
365typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
366#define __DEFINED_pthread_attr_t
367#endif
368
369#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
370typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
371#define __DEFINED_pthread_mutex_t
372#endif
373
374#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
375typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
376#define __DEFINED_mtx_t
377#endif
378
379#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
380typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
381#define __DEFINED_pthread_cond_t
382#endif
383
384#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
385typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
386#define __DEFINED_cnd_t
387#endif
388
389#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
390typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
391#define __DEFINED_pthread_rwlock_t
392#endif
393
394#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
395typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
396#define __DEFINED_pthread_barrier_t
397#endif
398
399
388#undef _Addr400#undef _Addr
389#undef _Int64401#undef _Int64
390#undef _Reg402#undef _Reg
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/endian.h deleted-5
...@@ -1,5 +0,0 @@
1#if _MIPSEL || __MIPSEL || __MIPSEL__
2#define __BYTE_ORDER __LITTLE_ENDIAN
3#else
4#define __BYTE_ORDER __BIG_ENDIAN
5#endif
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/hwcap.h+12-1
...@@ -1,3 +1,14 @@...@@ -1,3 +1,14 @@
1#define HWCAP_MIPS_R6 (1 << 0)1#define HWCAP_MIPS_R6 (1 << 0)
2#define HWCAP_MIPS_MSA (1 << 1)2#define HWCAP_MIPS_MSA (1 << 1)
3#define HWCAP_MIPS_CRC32 (1 << 2)
\ No newline at end of file
3#define HWCAP_MIPS_CRC32 (1 << 2)
4#define HWCAP_MIPS_MIPS16 (1 << 3)
5#define HWCAP_MIPS_MDMX (1 << 4)
6#define HWCAP_MIPS_MIPS3D (1 << 5)
7#define HWCAP_MIPS_SMARTMIPS (1 << 6)
8#define HWCAP_MIPS_DSP (1 << 7)
9#define HWCAP_MIPS_DSP2 (1 << 8)
10#define HWCAP_MIPS_DSP3 (1 << 9)
11#define HWCAP_MIPS_MIPS16E2 (1 << 10)
12#define HWCAP_LOONGSON_MMI (1 << 11)
13#define HWCAP_LOONGSON_EXT (1 << 12)
14#define HWCAP_LOONGSON_EXT2 (1 << 13)
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/ioctl.h+2-2
...@@ -110,5 +110,5 @@...@@ -110,5 +110,5 @@
110#define SIOCATMARK _IOR('s', 7, int)110#define SIOCATMARK _IOR('s', 7, int)
111#define SIOCSPGRP _IOW('s', 8, pid_t)111#define SIOCSPGRP _IOW('s', 8, pid_t)
112#define SIOCGPGRP _IOR('s', 9, pid_t)112#define SIOCGPGRP _IOR('s', 9, pid_t)
113#define SIOCGSTAMP 0x8906
114#define SIOCGSTAMPNS 0x8907
\ No newline at end of file
113#define SIOCGSTAMP _IOR(0x89, 6, char[16])
114#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/ipcstat.h created+1
...@@ -0,0 +1 @@
1#define IPC_STAT 0x102
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/limits.h deleted-7
...@@ -1,7 +0,0 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define LONG_BIT 32
4#endif
5
6#define LONG_MAX 0x7fffffffL
7#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/msg.h+15-12
...@@ -1,19 +1,19 @@...@@ -1,19 +1,19 @@
1struct msqid_ds {1struct msqid_ds {
2 struct ipc_perm msg_perm;2 struct ipc_perm msg_perm;
3#if _MIPSEL || __MIPSEL || __MIPSEL__3#if _MIPSEL || __MIPSEL || __MIPSEL__
4 time_t msg_stime;4 unsigned long __msg_stime_lo;
5 int __unused1;5 unsigned long __msg_stime_hi;
6 time_t msg_rtime;6 unsigned long __msg_rtime_lo;
7 int __unused2;7 unsigned long __msg_rtime_hi;
8 time_t msg_ctime;8 unsigned long __msg_ctime_lo;
9 int __unused3;9 unsigned long __msg_ctime_hi;
10#else10#else
11 int __unused1;11 unsigned long __msg_stime_hi;
12 time_t msg_stime;12 unsigned long __msg_stime_lo;
13 int __unused2;13 unsigned long __msg_rtime_hi;
14 time_t msg_rtime;14 unsigned long __msg_rtime_lo;
15 int __unused3;15 unsigned long __msg_ctime_hi;
16 time_t msg_ctime;16 unsigned long __msg_ctime_lo;
17#endif17#endif
18 unsigned long msg_cbytes;18 unsigned long msg_cbytes;
19 msgqnum_t msg_qnum;19 msgqnum_t msg_qnum;
...@@ -21,4 +21,7 @@ struct msqid_ds {...@@ -21,4 +21,7 @@ struct msqid_ds {
21 pid_t msg_lspid;21 pid_t msg_lspid;
22 pid_t msg_lrpid;22 pid_t msg_lrpid;
23 unsigned long __unused[2];23 unsigned long __unused[2];
24 time_t msg_stime;
25 time_t msg_rtime;
26 time_t msg_ctime;
24};27};
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/sem.h created+16
...@@ -0,0 +1,16 @@
1struct semid_ds {
2 struct ipc_perm sem_perm;
3 unsigned long __sem_otime_lo;
4 unsigned long __sem_ctime_lo;
5#if __BYTE_ORDER == __LITTLE_ENDIAN
6 unsigned short sem_nsems;
7 char __sem_nsems_pad[sizeof(long)-sizeof(short)];
8#else
9 char __sem_nsems_pad[sizeof(long)-sizeof(short)];
10 unsigned short sem_nsems;
11#endif
12 unsigned long __sem_otime_hi;
13 unsigned long __sem_ctime_hi;
14 time_t sem_otime;
15 time_t sem_ctime;
16};
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/shm.h created+29
...@@ -0,0 +1,29 @@
1#define SHMLBA 4096
2
3struct shmid_ds {
4 struct ipc_perm shm_perm;
5 size_t shm_segsz;
6 unsigned long __shm_atime_lo;
7 unsigned long __shm_dtime_lo;
8 unsigned long __shm_ctime_lo;
9 pid_t shm_cpid;
10 pid_t shm_lpid;
11 unsigned long shm_nattch;
12 unsigned short __shm_atime_hi;
13 unsigned short __shm_dtime_hi;
14 unsigned short __shm_ctime_hi;
15 unsigned short __pad1;
16 time_t shm_atime;
17 time_t shm_dtime;
18 time_t shm_ctime;
19};
20
21struct shminfo {
22 unsigned long shmmax, shmmin, shmmni, shmseg, shmall, __unused[4];
23};
24
25struct shm_info {
26 int __used_ids;
27 unsigned long shm_tot, shm_rss, shm_swp;
28 unsigned long __swap_attempts, __swap_successes;
29};
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/signal.h+6-2
...@@ -19,14 +19,18 @@ typedef struct {...@@ -19,14 +19,18 @@ typedef struct {
19} fpregset_t;19} fpregset_t;
20struct sigcontext {20struct sigcontext {
21 unsigned sc_regmask, sc_status;21 unsigned sc_regmask, sc_status;
22 unsigned long long sc_pc, sc_regs[32], sc_fpregs[32];22 unsigned long long sc_pc;
23 gregset_t sc_regs;
24 fpregset_t sc_fpregs;
23 unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp;25 unsigned sc_ownedfp, sc_fpc_csr, sc_fpc_eir, sc_used_math, sc_dsp;
24 unsigned long long sc_mdhi, sc_mdlo;26 unsigned long long sc_mdhi, sc_mdlo;
25 unsigned long sc_hi1, sc_lo1, sc_hi2, sc_lo2, sc_hi3, sc_lo3;27 unsigned long sc_hi1, sc_lo1, sc_hi2, sc_lo2, sc_hi3, sc_lo3;
26};28};
27typedef struct {29typedef struct {
28 unsigned regmask, status;30 unsigned regmask, status;
29 unsigned long long pc, gregs[32], fpregs[32];31 unsigned long long pc;
32 gregset_t gregs;
33 fpregset_t fpregs;
30 unsigned ownedfp, fpc_csr, fpc_eir, used_math, dsp;34 unsigned ownedfp, fpc_csr, fpc_eir, used_math, dsp;
31 unsigned long long mdhi, mdlo;35 unsigned long long mdhi, mdlo;
32 unsigned long hi1, lo1, hi2, lo2, hi3, lo3;36 unsigned long hi1, lo1, hi2, lo2, hi3, lo3;
lib/libc/include/mips-linux-musl/bits/socket.h-18
...@@ -1,19 +1,3 @@...@@ -1,19 +1,3 @@
1struct msghdr {
2 void *msg_name;
3 socklen_t msg_namelen;
4 struct iovec *msg_iov;
5 int msg_iovlen;
6 void *msg_control;
7 socklen_t msg_controllen;
8 int msg_flags;
9};
10
11struct cmsghdr {
12 socklen_t cmsg_len;
13 int cmsg_level;
14 int cmsg_type;
15};
16
17#define SOCK_STREAM 21#define SOCK_STREAM 2
18#define SOCK_DGRAM 12#define SOCK_DGRAM 1
193
...@@ -32,8 +16,6 @@ struct cmsghdr {...@@ -32,8 +16,6 @@ struct cmsghdr {
32#define SO_RCVBUF 0x100216#define SO_RCVBUF 0x1002
33#define SO_SNDLOWAT 0x100317#define SO_SNDLOWAT 0x1003
34#define SO_RCVLOWAT 0x100418#define SO_RCVLOWAT 0x1004
35#define SO_RCVTIMEO 0x1006
36#define SO_SNDTIMEO 0x1005
37#define SO_ERROR 0x100719#define SO_ERROR 0x1007
38#define SO_TYPE 0x100820#define SO_TYPE 0x1008
39#define SO_ACCEPTCONN 0x100921#define SO_ACCEPTCONN 0x1009
lib/libc/include/mips-linux-musl/bits/stat.h+8-4
...@@ -12,11 +12,15 @@ struct stat {...@@ -12,11 +12,15 @@ struct stat {
12 dev_t st_rdev;12 dev_t st_rdev;
13 long __st_padding2[2];13 long __st_padding2[2];
14 off_t st_size;14 off_t st_size;
15 struct timespec st_atim;15 struct {
16 struct timespec st_mtim;16 long tv_sec;
17 struct timespec st_ctim;17 long tv_nsec;
18 } __st_atim32, __st_mtim32, __st_ctim32;
18 blksize_t st_blksize;19 blksize_t st_blksize;
19 long __st_padding3;20 long __st_padding3;
20 blkcnt_t st_blocks;21 blkcnt_t st_blocks;
21 long __st_padding4[14];22 struct timespec st_atim;
23 struct timespec st_mtim;
24 struct timespec st_ctim;
25 long __st_padding4[2];
22};26};
\ No newline at end of file
lib/libc/include/mips-linux-musl/bits/syscall.h+25-21
...@@ -76,8 +76,8 @@...@@ -76,8 +76,8 @@
76#define __NR_setrlimit 407576#define __NR_setrlimit 4075
77#define __NR_getrlimit 407677#define __NR_getrlimit 4076
78#define __NR_getrusage 407778#define __NR_getrusage 4077
79#define __NR_gettimeofday 407879#define __NR_gettimeofday_time32 4078
80#define __NR_settimeofday 407980#define __NR_settimeofday_time32 4079
81#define __NR_getgroups 408081#define __NR_getgroups 4080
82#define __NR_setgroups 408182#define __NR_setgroups 4081
83#define __NR_reserved82 408283#define __NR_reserved82 4082
...@@ -256,14 +256,14 @@...@@ -256,14 +256,14 @@
256#define __NR_statfs64 4255256#define __NR_statfs64 4255
257#define __NR_fstatfs64 4256257#define __NR_fstatfs64 4256
258#define __NR_timer_create 4257258#define __NR_timer_create 4257
259#define __NR_timer_settime 4258259#define __NR_timer_settime32 4258
260#define __NR_timer_gettime 4259260#define __NR_timer_gettime32 4259
261#define __NR_timer_getoverrun 4260261#define __NR_timer_getoverrun 4260
262#define __NR_timer_delete 4261262#define __NR_timer_delete 4261
263#define __NR_clock_settime 4262263#define __NR_clock_settime32 4262
264#define __NR_clock_gettime 4263264#define __NR_clock_gettime32 4263
265#define __NR_clock_getres 4264265#define __NR_clock_getres_time32 4264
266#define __NR_clock_nanosleep 4265266#define __NR_clock_nanosleep_time32 4265
267#define __NR_tgkill 4266267#define __NR_tgkill 4266
268#define __NR_utimes 4267268#define __NR_utimes 4267
269#define __NR_mbind 4268269#define __NR_mbind 4268
...@@ -319,8 +319,8 @@...@@ -319,8 +319,8 @@
319#define __NR_eventfd 4319319#define __NR_eventfd 4319
320#define __NR_fallocate 4320320#define __NR_fallocate 4320
321#define __NR_timerfd_create 4321321#define __NR_timerfd_create 4321
322#define __NR_timerfd_gettime 4322322#define __NR_timerfd_gettime32 4322
323#define __NR_timerfd_settime 4323323#define __NR_timerfd_settime32 4323
324#define __NR_signalfd4 4324324#define __NR_signalfd4 4324
325#define __NR_eventfd2 4325325#define __NR_eventfd2 4325
326#define __NR_epoll_create1 4326326#define __NR_epoll_create1 4326
...@@ -406,6 +406,8 @@...@@ -406,6 +406,8 @@
406#define __NR_fsconfig 4431406#define __NR_fsconfig 4431
407#define __NR_fsmount 4432407#define __NR_fsmount 4432
408#define __NR_fspick 4433408#define __NR_fspick 4433
409#define __NR_pidfd_open 4434
410#define __NR_clone3 4435
409411
410#define SYS_syscall 4000412#define SYS_syscall 4000
411#define SYS_exit 4001413#define SYS_exit 4001
...@@ -485,8 +487,8 @@...@@ -485,8 +487,8 @@
485#define SYS_setrlimit 4075487#define SYS_setrlimit 4075
486#define SYS_getrlimit 4076488#define SYS_getrlimit 4076
487#define SYS_getrusage 4077489#define SYS_getrusage 4077
488#define SYS_gettimeofday 4078490#define SYS_gettimeofday_time32 4078
489#define SYS_settimeofday 4079491#define SYS_settimeofday_time32 4079
490#define SYS_getgroups 4080492#define SYS_getgroups 4080
491#define SYS_setgroups 4081493#define SYS_setgroups 4081
492#define SYS_reserved82 4082494#define SYS_reserved82 4082
...@@ -665,14 +667,14 @@...@@ -665,14 +667,14 @@
665#define SYS_statfs64 4255667#define SYS_statfs64 4255
666#define SYS_fstatfs64 4256668#define SYS_fstatfs64 4256
667#define SYS_timer_create 4257669#define SYS_timer_create 4257
668#define SYS_timer_settime 4258670#define SYS_timer_settime32 4258
669#define SYS_timer_gettime 4259671#define SYS_timer_gettime32 4259
670#define SYS_timer_getoverrun 4260672#define SYS_timer_getoverrun 4260
671#define SYS_timer_delete 4261673#define SYS_timer_delete 4261
672#define SYS_clock_settime 4262674#define SYS_clock_settime32 4262
673#define SYS_clock_gettime 4263675#define SYS_clock_gettime32 4263
674#define SYS_clock_getres 4264676#define SYS_clock_getres_time32 4264
675#define SYS_clock_nanosleep 4265677#define SYS_clock_nanosleep_time32 4265
676#define SYS_tgkill 4266678#define SYS_tgkill 4266
677#define SYS_utimes 4267679#define SYS_utimes 4267
678#define SYS_mbind 4268680#define SYS_mbind 4268
...@@ -728,8 +730,8 @@...@@ -728,8 +730,8 @@
728#define SYS_eventfd 4319730#define SYS_eventfd 4319
729#define SYS_fallocate 4320731#define SYS_fallocate 4320
730#define SYS_timerfd_create 4321732#define SYS_timerfd_create 4321
731#define SYS_timerfd_gettime 4322733#define SYS_timerfd_gettime32 4322
732#define SYS_timerfd_settime 4323734#define SYS_timerfd_settime32 4323
733#define SYS_signalfd4 4324735#define SYS_signalfd4 4324
734#define SYS_eventfd2 4325736#define SYS_eventfd2 4325
735#define SYS_epoll_create1 4326737#define SYS_epoll_create1 4326
...@@ -814,4 +816,6 @@...@@ -814,4 +816,6 @@
814#define SYS_fsopen 4430816#define SYS_fsopen 4430
815#define SYS_fsconfig 4431817#define SYS_fsconfig 4431
816#define SYS_fsmount 4432818#define SYS_fsmount 4432
817#define SYS_fspick 4433
\ No newline at end of file
819#define SYS_fspick 4433
820#define SYS_pidfd_open 4434
821#define SYS_clone3 4435
\ No newline at end of file
lib/libc/include/mips64-linux-musl/bits/alltypes.h+66-55
...@@ -2,16 +2,13 @@...@@ -2,16 +2,13 @@
2#define _Int64 long2#define _Int64 long
3#define _Reg long3#define _Reg long
44
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)5#if _MIPSEL || __MIPSEL || __MIPSEL__
6typedef __builtin_va_list va_list;6#define __BYTE_ORDER 1234
7#define __DEFINED_va_list7#else
8#endif8#define __BYTE_ORDER 4321
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif9#endif
1410
11#define __LONG_MAX 0x7fffffffffffffffL
1512
16#ifndef __cplusplus13#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)14#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -38,57 +35,14 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -38,57 +35,14 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
38#endif35#endif
3936
4037
41#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
42typedef long time_t;
43#define __DEFINED_time_t
44#endif
45
46#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
47typedef long suseconds_t;
48#define __DEFINED_suseconds_t
49#endif
50
51
52#if defined(__NEED_nlink_t) && !defined(__DEFINED_nlink_t)38#if defined(__NEED_nlink_t) && !defined(__DEFINED_nlink_t)
53typedef unsigned nlink_t;39typedef unsigned nlink_t;
54#define __DEFINED_nlink_t40#define __DEFINED_nlink_t
55#endif41#endif
5642
5743#define __LITTLE_ENDIAN 1234
58#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)44#define __BIG_ENDIAN 4321
59typedef struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;45#define __USE_TIME_BITS64 1
60#define __DEFINED_pthread_attr_t
61#endif
62
63#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
64typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
65#define __DEFINED_pthread_mutex_t
66#endif
67
68#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
69typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
70#define __DEFINED_mtx_t
71#endif
72
73#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
74typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
75#define __DEFINED_pthread_cond_t
76#endif
77
78#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
79typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
80#define __DEFINED_cnd_t
81#endif
82
83#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
84typedef struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
85#define __DEFINED_pthread_rwlock_t
86#endif
87
88#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
89typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
90#define __DEFINED_pthread_barrier_t
91#endif
9246
93#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)47#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
94typedef unsigned _Addr size_t;48typedef unsigned _Addr size_t;
...@@ -125,6 +79,16 @@ typedef _Reg register_t;...@@ -125,6 +79,16 @@ typedef _Reg register_t;
125#define __DEFINED_register_t79#define __DEFINED_register_t
126#endif80#endif
12781
82#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
83typedef _Int64 time_t;
84#define __DEFINED_time_t
85#endif
86
87#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
88typedef _Int64 suseconds_t;
89#define __DEFINED_suseconds_t
90#endif
91
12892
129#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)93#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
130typedef signed char int8_t;94typedef signed char int8_t;
...@@ -260,7 +224,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -260,7 +224,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
260#endif224#endif
261225
262#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)226#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
263struct timespec { time_t tv_sec; long tv_nsec; };227struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
264#define __DEFINED_struct_timespec228#define __DEFINED_struct_timespec
265#endif229#endif
266230
...@@ -356,6 +320,17 @@ typedef struct _IO_FILE FILE;...@@ -356,6 +320,17 @@ typedef struct _IO_FILE FILE;
356#endif320#endif
357321
358322
323#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
324typedef __builtin_va_list va_list;
325#define __DEFINED_va_list
326#endif
327
328#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
329typedef __builtin_va_list __isoc_va_list;
330#define __DEFINED___isoc_va_list
331#endif
332
333
359#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)334#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
360typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;335typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
361#define __DEFINED_mbstate_t336#define __DEFINED_mbstate_t
...@@ -391,6 +366,42 @@ typedef unsigned short sa_family_t;...@@ -391,6 +366,42 @@ typedef unsigned short sa_family_t;
391#endif366#endif
392367
393368
369#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
370typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
371#define __DEFINED_pthread_attr_t
372#endif
373
374#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
375typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
376#define __DEFINED_pthread_mutex_t
377#endif
378
379#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
380typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
381#define __DEFINED_mtx_t
382#endif
383
384#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
385typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
386#define __DEFINED_pthread_cond_t
387#endif
388
389#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
390typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
391#define __DEFINED_cnd_t
392#endif
393
394#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
395typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
396#define __DEFINED_pthread_rwlock_t
397#endif
398
399#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
400typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
401#define __DEFINED_pthread_barrier_t
402#endif
403
404
394#undef _Addr405#undef _Addr
395#undef _Int64406#undef _Int64
396#undef _Reg407#undef _Reg
\ No newline at end of file
lib/libc/include/mips64-linux-musl/bits/endian.h deleted-5
...@@ -1,5 +0,0 @@
1#if _MIPSEL || __MIPSEL || __MIPSEL__
2#define __BYTE_ORDER __LITTLE_ENDIAN
3#else
4#define __BYTE_ORDER __BIG_ENDIAN
5#endif
\ No newline at end of file
lib/libc/include/mips64-linux-musl/bits/limits.h deleted-7
...@@ -1,7 +0,0 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define LONG_BIT 64
4#endif
5
6#define LONG_MAX 0x7fffffffffffffffL
7#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
lib/libc/include/mips64-linux-musl/bits/socket.h-34
...@@ -1,37 +1,3 @@...@@ -1,37 +1,3 @@
1#include <endian.h>
2
3struct msghdr {
4 void *msg_name;
5 socklen_t msg_namelen;
6 struct iovec *msg_iov;
7#if __BYTE_ORDER == __BIG_ENDIAN
8 int __pad1, msg_iovlen;
9#else
10 int msg_iovlen, __pad1;
11#endif
12 void *msg_control;
13#if __BYTE_ORDER == __BIG_ENDIAN
14 int __pad2;
15 socklen_t msg_controllen;
16#else
17 socklen_t msg_controllen;
18 int __pad2;
19#endif
20 int msg_flags;
21};
22
23struct cmsghdr {
24#if __BYTE_ORDER == __BIG_ENDIAN
25 int __pad1;
26 socklen_t cmsg_len;
27#else
28 socklen_t cmsg_len;
29 int __pad1;
30#endif
31 int cmsg_level;
32 int cmsg_type;
33};
34
35#define SOCK_STREAM 21#define SOCK_STREAM 2
36#define SOCK_DGRAM 12#define SOCK_DGRAM 1
37#define SOL_SOCKET 655353#define SOL_SOCKET 65535
lib/libc/include/mips64-linux-musl/bits/syscall.h+5-1
...@@ -336,6 +336,8 @@...@@ -336,6 +336,8 @@
336#define __NR_fsconfig 5431336#define __NR_fsconfig 5431
337#define __NR_fsmount 5432337#define __NR_fsmount 5432
338#define __NR_fspick 5433338#define __NR_fspick 5433
339#define __NR_pidfd_open 5434
340#define __NR_clone3 5435
339341
340#define SYS_read 5000342#define SYS_read 5000
341#define SYS_write 5001343#define SYS_write 5001
...@@ -674,4 +676,6 @@...@@ -674,4 +676,6 @@
674#define SYS_fsopen 5430676#define SYS_fsopen 5430
675#define SYS_fsconfig 5431677#define SYS_fsconfig 5431
676#define SYS_fsmount 5432678#define SYS_fsmount 5432
677#define SYS_fspick 5433
\ No newline at end of file
679#define SYS_fspick 5433
680#define SYS_pidfd_open 5434
681#define SYS_clone3 5435
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/alltypes.h+64-57
...@@ -1,17 +1,10 @@...@@ -1,17 +1,10 @@
1#define _REDIR_TIME64 1
1#define _Addr int2#define _Addr int
2#define _Int64 long long3#define _Int64 long long
3#define _Reg int4#define _Reg int
45
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)6#define __BYTE_ORDER 4321
6typedef __builtin_va_list va_list;7#define __LONG_MAX 0x7fffffffL
7#define __DEFINED_va_list
8#endif
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif
14
158
16#ifndef __cplusplus9#ifndef __cplusplus
17#ifdef __WCHAR_TYPE__10#ifdef __WCHAR_TYPE__
...@@ -45,52 +38,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -45,52 +38,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
45#define __DEFINED_max_align_t38#define __DEFINED_max_align_t
46#endif39#endif
4740
4841#define __LITTLE_ENDIAN 1234
49#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)42#define __BIG_ENDIAN 4321
50typedef long time_t;43#define __USE_TIME_BITS64 1
51#define __DEFINED_time_t
52#endif
53
54#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
55typedef long suseconds_t;
56#define __DEFINED_suseconds_t
57#endif
58
59
60#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
61typedef struct { union { int __i[9]; volatile int __vi[9]; unsigned __s[9]; } __u; } pthread_attr_t;
62#define __DEFINED_pthread_attr_t
63#endif
64
65#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
66typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } pthread_mutex_t;
67#define __DEFINED_pthread_mutex_t
68#endif
69
70#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
71typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void *volatile __p[6]; } __u; } mtx_t;
72#define __DEFINED_mtx_t
73#endif
74
75#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
76typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } pthread_cond_t;
77#define __DEFINED_pthread_cond_t
78#endif
79
80#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
81typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12]; } __u; } cnd_t;
82#define __DEFINED_cnd_t
83#endif
84
85#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
86typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[8]; } __u; } pthread_rwlock_t;
87#define __DEFINED_pthread_rwlock_t
88#endif
89
90#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
91typedef struct { union { int __i[5]; volatile int __vi[5]; void *__p[5]; } __u; } pthread_barrier_t;
92#define __DEFINED_pthread_barrier_t
93#endif
9444
95#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)45#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
96typedef unsigned _Addr size_t;46typedef unsigned _Addr size_t;
...@@ -127,6 +77,16 @@ typedef _Reg register_t;...@@ -127,6 +77,16 @@ typedef _Reg register_t;
127#define __DEFINED_register_t77#define __DEFINED_register_t
128#endif78#endif
12979
80#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
81typedef _Int64 time_t;
82#define __DEFINED_time_t
83#endif
84
85#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
86typedef _Int64 suseconds_t;
87#define __DEFINED_suseconds_t
88#endif
89
13090
131#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)91#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
132typedef signed char int8_t;92typedef signed char int8_t;
...@@ -262,7 +222,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -262,7 +222,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
262#endif222#endif
263223
264#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)224#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
265struct timespec { time_t tv_sec; long tv_nsec; };225struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
266#define __DEFINED_struct_timespec226#define __DEFINED_struct_timespec
267#endif227#endif
268228
...@@ -358,6 +318,17 @@ typedef struct _IO_FILE FILE;...@@ -358,6 +318,17 @@ typedef struct _IO_FILE FILE;
358#endif318#endif
359319
360320
321#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
322typedef __builtin_va_list va_list;
323#define __DEFINED_va_list
324#endif
325
326#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
327typedef __builtin_va_list __isoc_va_list;
328#define __DEFINED___isoc_va_list
329#endif
330
331
361#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)332#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
362typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;333typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
363#define __DEFINED_mbstate_t334#define __DEFINED_mbstate_t
...@@ -393,6 +364,42 @@ typedef unsigned short sa_family_t;...@@ -393,6 +364,42 @@ typedef unsigned short sa_family_t;
393#endif364#endif
394365
395366
367#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
368typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
369#define __DEFINED_pthread_attr_t
370#endif
371
372#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
373typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
374#define __DEFINED_pthread_mutex_t
375#endif
376
377#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
378typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
379#define __DEFINED_mtx_t
380#endif
381
382#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
383typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
384#define __DEFINED_pthread_cond_t
385#endif
386
387#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
388typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
389#define __DEFINED_cnd_t
390#endif
391
392#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
393typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
394#define __DEFINED_pthread_rwlock_t
395#endif
396
397#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
398typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
399#define __DEFINED_pthread_barrier_t
400#endif
401
402
396#undef _Addr403#undef _Addr
397#undef _Int64404#undef _Int64
398#undef _Reg405#undef _Reg
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/endian.h deleted-15
...@@ -1,15 +0,0 @@
1#ifdef __BIG_ENDIAN__
2 #if __BIG_ENDIAN__
3 #define __BYTE_ORDER __BIG_ENDIAN
4 #endif
5#endif /* __BIG_ENDIAN__ */
6
7#ifdef __LITTLE_ENDIAN__
8 #if __LITTLE_ENDIAN__
9 #define __BYTE_ORDER __LITTLE_ENDIAN
10 #endif
11#endif /* __LITTLE_ENDIAN__ */
12
13#ifndef __BYTE_ORDER
14 #define __BYTE_ORDER __BIG_ENDIAN
15#endif
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/ioctl.h+2-2
...@@ -116,5 +116,5 @@...@@ -116,5 +116,5 @@
116#define FIOGETOWN 0x8903116#define FIOGETOWN 0x8903
117#define SIOCGPGRP 0x8904117#define SIOCGPGRP 0x8904
118#define SIOCATMARK 0x8905118#define SIOCATMARK 0x8905
119#define SIOCGSTAMP 0x8906
120#define SIOCGSTAMPNS 0x8907
\ No newline at end of file
119#define SIOCGSTAMP _IOR(0x89, 6, char[16])
120#define SIOCGSTAMPNS _IOR(0x89, 7, char[16])
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/ipcstat.h created+1
...@@ -0,0 +1 @@
1#define IPC_STAT 0x102
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/limits.h deleted-7
...@@ -1,7 +0,0 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define LONG_BIT 32
4#endif
5
6#define LONG_MAX 0x7fffffffL
7#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/msg.h+9-6
...@@ -1,15 +1,18 @@...@@ -1,15 +1,18 @@
1struct msqid_ds {1struct msqid_ds {
2 struct ipc_perm msg_perm;2 struct ipc_perm msg_perm;
3 int __unused1;3 unsigned long __msg_stime_hi;
4 time_t msg_stime;4 unsigned long __msg_stime_lo;
5 int __unused2;5 unsigned long __msg_rtime_hi;
6 time_t msg_rtime;6 unsigned long __msg_rtime_lo;
7 int __unused3;7 unsigned long __msg_ctime_hi;
8 time_t msg_ctime;8 unsigned long __msg_ctime_lo;
9 unsigned long msg_cbytes;9 unsigned long msg_cbytes;
10 msgqnum_t msg_qnum;10 msgqnum_t msg_qnum;
11 msglen_t msg_qbytes;11 msglen_t msg_qbytes;
12 pid_t msg_lspid;12 pid_t msg_lspid;
13 pid_t msg_lrpid;13 pid_t msg_lrpid;
14 unsigned long __unused[2];14 unsigned long __unused[2];
15 time_t msg_stime;
16 time_t msg_rtime;
17 time_t msg_ctime;
15};18};
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/sem.h+6-4
...@@ -1,10 +1,12 @@...@@ -1,10 +1,12 @@
1struct semid_ds {1struct semid_ds {
2 struct ipc_perm sem_perm;2 struct ipc_perm sem_perm;
3 int __unused1;3 unsigned long __sem_otime_hi;
4 time_t sem_otime;4 unsigned long __sem_otime_lo;
5 int __unused2;5 unsigned long __sem_ctime_hi;
6 time_t sem_ctime;6 unsigned long __sem_ctime_lo;
7 unsigned short __sem_nsems_pad, sem_nsems;7 unsigned short __sem_nsems_pad, sem_nsems;
8 long __unused3;8 long __unused3;
9 long __unused4;9 long __unused4;
10 time_t sem_otime;
11 time_t sem_ctime;
10};12};
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/shm.h+9-7
...@@ -2,19 +2,21 @@...@@ -2,19 +2,21 @@
22
3struct shmid_ds {3struct shmid_ds {
4 struct ipc_perm shm_perm;4 struct ipc_perm shm_perm;
5 int __unused1;5 unsigned long __shm_atime_hi;
6 time_t shm_atime;6 unsigned long __shm_atime_lo;
7 int __unused2;7 unsigned long __shm_dtime_hi;
8 time_t shm_dtime;8 unsigned long __shm_dtime_lo;
9 int __unused3;9 unsigned long __shm_ctime_hi;
10 time_t shm_ctime;10 unsigned long __shm_ctime_lo;
11 int __unused4;
12 size_t shm_segsz;11 size_t shm_segsz;
13 pid_t shm_cpid;12 pid_t shm_cpid;
14 pid_t shm_lpid;13 pid_t shm_lpid;
15 unsigned long shm_nattch;14 unsigned long shm_nattch;
16 unsigned long __pad1;15 unsigned long __pad1;
17 unsigned long __pad2;16 unsigned long __pad2;
17 time_t shm_atime;
18 time_t shm_dtime;
19 time_t shm_ctime;
18};20};
1921
20struct shminfo {22struct shminfo {
lib/libc/include/powerpc-linux-musl/bits/signal.h+1-1
...@@ -28,7 +28,7 @@ struct sigcontext {...@@ -28,7 +28,7 @@ struct sigcontext {
28 int signal;28 int signal;
29 unsigned long handler;29 unsigned long handler;
30 unsigned long oldmask;30 unsigned long oldmask;
31 void *regs;31 struct pt_regs *regs;
32};32};
3333
34typedef struct {34typedef struct {
lib/libc/include/powerpc-linux-musl/bits/socket.h-18
...@@ -1,19 +1,3 @@...@@ -1,19 +1,3 @@
1struct msghdr {
2 void *msg_name;
3 socklen_t msg_namelen;
4 struct iovec *msg_iov;
5 int msg_iovlen;
6 void *msg_control;
7 socklen_t msg_controllen;
8 int msg_flags;
9};
10
11struct cmsghdr {
12 socklen_t cmsg_len;
13 int cmsg_level;
14 int cmsg_type;
15};
16
17#define SO_DEBUG 11#define SO_DEBUG 1
18#define SO_REUSEADDR 22#define SO_REUSEADDR 2
19#define SO_TYPE 33#define SO_TYPE 3
...@@ -31,8 +15,6 @@ struct cmsghdr {...@@ -31,8 +15,6 @@ struct cmsghdr {
31#define SO_REUSEPORT 1515#define SO_REUSEPORT 15
32#define SO_RCVLOWAT 1616#define SO_RCVLOWAT 16
33#define SO_SNDLOWAT 1717#define SO_SNDLOWAT 17
34#define SO_RCVTIMEO 18
35#define SO_SNDTIMEO 19
36#define SO_PASSCRED 2018#define SO_PASSCRED 20
37#define SO_PEERCRED 2119#define SO_PEERCRED 21
38#define SO_ACCEPTCONN 3020#define SO_ACCEPTCONN 30
lib/libc/include/powerpc-linux-musl/bits/stat.h+5-1
...@@ -13,8 +13,12 @@ struct stat {...@@ -13,8 +13,12 @@ struct stat {
13 off_t st_size;13 off_t st_size;
14 blksize_t st_blksize;14 blksize_t st_blksize;
15 blkcnt_t st_blocks;15 blkcnt_t st_blocks;
16 struct {
17 long tv_sec;
18 long tv_nsec;
19 } __st_atim32, __st_mtim32, __st_ctim32;
20 unsigned __unused[2];
16 struct timespec st_atim;21 struct timespec st_atim;
17 struct timespec st_mtim;22 struct timespec st_mtim;
18 struct timespec st_ctim;23 struct timespec st_ctim;
19 unsigned __unused[2];
20};24};
\ No newline at end of file
lib/libc/include/powerpc-linux-musl/bits/syscall.h+25-21
...@@ -76,8 +76,8 @@...@@ -76,8 +76,8 @@
76#define __NR_setrlimit 7576#define __NR_setrlimit 75
77#define __NR_getrlimit 7677#define __NR_getrlimit 76
78#define __NR_getrusage 7778#define __NR_getrusage 77
79#define __NR_gettimeofday 7879#define __NR_gettimeofday_time32 78
80#define __NR_settimeofday 7980#define __NR_settimeofday_time32 79
81#define __NR_getgroups 8081#define __NR_getgroups 80
82#define __NR_setgroups 8182#define __NR_setgroups 81
83#define __NR_select 8283#define __NR_select 82
...@@ -238,14 +238,14 @@...@@ -238,14 +238,14 @@
238#define __NR_epoll_wait 238238#define __NR_epoll_wait 238
239#define __NR_remap_file_pages 239239#define __NR_remap_file_pages 239
240#define __NR_timer_create 240240#define __NR_timer_create 240
241#define __NR_timer_settime 241241#define __NR_timer_settime32 241
242#define __NR_timer_gettime 242242#define __NR_timer_gettime32 242
243#define __NR_timer_getoverrun 243243#define __NR_timer_getoverrun 243
244#define __NR_timer_delete 244244#define __NR_timer_delete 244
245#define __NR_clock_settime 245245#define __NR_clock_settime32 245
246#define __NR_clock_gettime 246246#define __NR_clock_gettime32 246
247#define __NR_clock_getres 247247#define __NR_clock_getres_time32 247
248#define __NR_clock_nanosleep 248248#define __NR_clock_nanosleep_time32 248
249#define __NR_swapcontext 249249#define __NR_swapcontext 249
250#define __NR_tgkill 250250#define __NR_tgkill 250
251#define __NR_utimes 251251#define __NR_utimes 251
...@@ -307,8 +307,8 @@...@@ -307,8 +307,8 @@
307#define __NR_sync_file_range2 308307#define __NR_sync_file_range2 308
308#define __NR_fallocate 309308#define __NR_fallocate 309
309#define __NR_subpage_prot 310309#define __NR_subpage_prot 310
310#define __NR_timerfd_settime 311310#define __NR_timerfd_settime32 311
311#define __NR_timerfd_gettime 312311#define __NR_timerfd_gettime32 312
312#define __NR_signalfd4 313312#define __NR_signalfd4 313
313#define __NR_eventfd2 314313#define __NR_eventfd2 314
314#define __NR_epoll_create1 315314#define __NR_epoll_create1 315
...@@ -413,6 +413,8 @@...@@ -413,6 +413,8 @@
413#define __NR_fsconfig 431413#define __NR_fsconfig 431
414#define __NR_fsmount 432414#define __NR_fsmount 432
415#define __NR_fspick 433415#define __NR_fspick 433
416#define __NR_pidfd_open 434
417#define __NR_clone3 435
416418
417#define SYS_restart_syscall 0419#define SYS_restart_syscall 0
418#define SYS_exit 1420#define SYS_exit 1
...@@ -492,8 +494,8 @@...@@ -492,8 +494,8 @@
492#define SYS_setrlimit 75494#define SYS_setrlimit 75
493#define SYS_getrlimit 76495#define SYS_getrlimit 76
494#define SYS_getrusage 77496#define SYS_getrusage 77
495#define SYS_gettimeofday 78497#define SYS_gettimeofday_time32 78
496#define SYS_settimeofday 79498#define SYS_settimeofday_time32 79
497#define SYS_getgroups 80499#define SYS_getgroups 80
498#define SYS_setgroups 81500#define SYS_setgroups 81
499#define SYS_select 82501#define SYS_select 82
...@@ -654,14 +656,14 @@...@@ -654,14 +656,14 @@
654#define SYS_epoll_wait 238656#define SYS_epoll_wait 238
655#define SYS_remap_file_pages 239657#define SYS_remap_file_pages 239
656#define SYS_timer_create 240658#define SYS_timer_create 240
657#define SYS_timer_settime 241659#define SYS_timer_settime32 241
658#define SYS_timer_gettime 242660#define SYS_timer_gettime32 242
659#define SYS_timer_getoverrun 243661#define SYS_timer_getoverrun 243
660#define SYS_timer_delete 244662#define SYS_timer_delete 244
661#define SYS_clock_settime 245663#define SYS_clock_settime32 245
662#define SYS_clock_gettime 246664#define SYS_clock_gettime32 246
663#define SYS_clock_getres 247665#define SYS_clock_getres_time32 247
664#define SYS_clock_nanosleep 248666#define SYS_clock_nanosleep_time32 248
665#define SYS_swapcontext 249667#define SYS_swapcontext 249
666#define SYS_tgkill 250668#define SYS_tgkill 250
667#define SYS_utimes 251669#define SYS_utimes 251
...@@ -723,8 +725,8 @@...@@ -723,8 +725,8 @@
723#define SYS_sync_file_range2 308725#define SYS_sync_file_range2 308
724#define SYS_fallocate 309726#define SYS_fallocate 309
725#define SYS_subpage_prot 310727#define SYS_subpage_prot 310
726#define SYS_timerfd_settime 311728#define SYS_timerfd_settime32 311
727#define SYS_timerfd_gettime 312729#define SYS_timerfd_gettime32 312
728#define SYS_signalfd4 313730#define SYS_signalfd4 313
729#define SYS_eventfd2 314731#define SYS_eventfd2 314
730#define SYS_epoll_create1 315732#define SYS_epoll_create1 315
...@@ -828,4 +830,6 @@...@@ -828,4 +830,6 @@
828#define SYS_fsopen 430830#define SYS_fsopen 430
829#define SYS_fsconfig 431831#define SYS_fsconfig 431
830#define SYS_fsmount 432832#define SYS_fsmount 432
831#define SYS_fspick 433
\ No newline at end of file
833#define SYS_fspick 433
834#define SYS_pidfd_open 434
835#define SYS_clone3 435
\ No newline at end of file
lib/libc/include/powerpc64-linux-musl/bits/alltypes.h+66-55
...@@ -2,16 +2,13 @@...@@ -2,16 +2,13 @@
2#define _Int64 long2#define _Int64 long
3#define _Reg long3#define _Reg long
44
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)5#if __BIG_ENDIAN__
6typedef __builtin_va_list va_list;6#define __BYTE_ORDER 4321
7#define __DEFINED_va_list7#else
8#endif8#define __BYTE_ORDER 1234
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif9#endif
1410
11#define __LONG_MAX 0x7fffffffffffffffL
1512
16#ifndef __cplusplus13#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)14#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -37,52 +34,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -37,52 +34,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
37#define __DEFINED_max_align_t34#define __DEFINED_max_align_t
38#endif35#endif
3936
4037#define __LITTLE_ENDIAN 1234
41#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)38#define __BIG_ENDIAN 4321
42typedef long time_t;39#define __USE_TIME_BITS64 1
43#define __DEFINED_time_t
44#endif
45
46#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
47typedef long suseconds_t;
48#define __DEFINED_suseconds_t
49#endif
50
51
52#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
53typedef struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
54#define __DEFINED_pthread_attr_t
55#endif
56
57#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
58typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
59#define __DEFINED_pthread_mutex_t
60#endif
61
62#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
63typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
64#define __DEFINED_mtx_t
65#endif
66
67#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
68typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
69#define __DEFINED_pthread_cond_t
70#endif
71
72#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
73typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
74#define __DEFINED_cnd_t
75#endif
76
77#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
78typedef struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
79#define __DEFINED_pthread_rwlock_t
80#endif
81
82#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
83typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
84#define __DEFINED_pthread_barrier_t
85#endif
8640
87#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)41#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
88typedef unsigned _Addr size_t;42typedef unsigned _Addr size_t;
...@@ -119,6 +73,16 @@ typedef _Reg register_t;...@@ -119,6 +73,16 @@ typedef _Reg register_t;
119#define __DEFINED_register_t73#define __DEFINED_register_t
120#endif74#endif
12175
76#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
77typedef _Int64 time_t;
78#define __DEFINED_time_t
79#endif
80
81#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
82typedef _Int64 suseconds_t;
83#define __DEFINED_suseconds_t
84#endif
85
12286
123#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)87#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
124typedef signed char int8_t;88typedef signed char int8_t;
...@@ -254,7 +218,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -254,7 +218,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
254#endif218#endif
255219
256#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)220#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
257struct timespec { time_t tv_sec; long tv_nsec; };221struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
258#define __DEFINED_struct_timespec222#define __DEFINED_struct_timespec
259#endif223#endif
260224
...@@ -350,6 +314,17 @@ typedef struct _IO_FILE FILE;...@@ -350,6 +314,17 @@ typedef struct _IO_FILE FILE;
350#endif314#endif
351315
352316
317#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
318typedef __builtin_va_list va_list;
319#define __DEFINED_va_list
320#endif
321
322#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
323typedef __builtin_va_list __isoc_va_list;
324#define __DEFINED___isoc_va_list
325#endif
326
327
353#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)328#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
354typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;329typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
355#define __DEFINED_mbstate_t330#define __DEFINED_mbstate_t
...@@ -385,6 +360,42 @@ typedef unsigned short sa_family_t;...@@ -385,6 +360,42 @@ typedef unsigned short sa_family_t;
385#endif360#endif
386361
387362
363#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
364typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
365#define __DEFINED_pthread_attr_t
366#endif
367
368#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
369typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
370#define __DEFINED_pthread_mutex_t
371#endif
372
373#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
374typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
375#define __DEFINED_mtx_t
376#endif
377
378#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
379typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
380#define __DEFINED_pthread_cond_t
381#endif
382
383#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
384typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
385#define __DEFINED_cnd_t
386#endif
387
388#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
389typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
390#define __DEFINED_pthread_rwlock_t
391#endif
392
393#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
394typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
395#define __DEFINED_pthread_barrier_t
396#endif
397
398
388#undef _Addr399#undef _Addr
389#undef _Int64400#undef _Int64
390#undef _Reg401#undef _Reg
\ No newline at end of file
lib/libc/include/powerpc64-linux-musl/bits/endian.h deleted-5
...@@ -1,5 +0,0 @@
1#if __BIG_ENDIAN__
2#define __BYTE_ORDER __BIG_ENDIAN
3#else
4#define __BYTE_ORDER __LITTLE_ENDIAN
5#endif
\ No newline at end of file
lib/libc/include/powerpc64-linux-musl/bits/signal.h+2-6
...@@ -9,11 +9,7 @@...@@ -9,11 +9,7 @@
9#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)9#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
1010
11typedef unsigned long greg_t, gregset_t[48];11typedef unsigned long greg_t, gregset_t[48];
1212typedef double fpregset_t[33];
13typedef struct {
14 double fpregs[32];
15 double fpscr;
16} fpregset_t;
1713
18typedef struct {14typedef struct {
19#ifdef __GNUC__15#ifdef __GNUC__
...@@ -36,7 +32,7 @@ typedef struct sigcontext {...@@ -36,7 +32,7 @@ typedef struct sigcontext {
36 int _pad0;32 int _pad0;
37 unsigned long handler;33 unsigned long handler;
38 unsigned long oldmask;34 unsigned long oldmask;
39 void *regs;35 struct pt_regs *regs;
40 gregset_t gp_regs;36 gregset_t gp_regs;
41 fpregset_t fp_regs;37 fpregset_t fp_regs;
42 vrregset_t *v_regs;38 vrregset_t *v_regs;
lib/libc/include/powerpc64-linux-musl/bits/socket.h-34
...@@ -1,37 +1,3 @@...@@ -1,37 +1,3 @@
1#include <endian.h>
2
3struct msghdr {
4 void *msg_name;
5 socklen_t msg_namelen;
6 struct iovec *msg_iov;
7#if __BYTE_ORDER == __BIG_ENDIAN
8 int __pad1, msg_iovlen;
9#else
10 int msg_iovlen, __pad1;
11#endif
12 void *msg_control;
13#if __BYTE_ORDER == __BIG_ENDIAN
14 int __pad2;
15 socklen_t msg_controllen;
16#else
17 socklen_t msg_controllen;
18 int __pad2;
19#endif
20 int msg_flags;
21};
22
23struct cmsghdr {
24#if __BYTE_ORDER == __BIG_ENDIAN
25 int __pad1;
26 socklen_t cmsg_len;
27#else
28 socklen_t cmsg_len;
29 int __pad1;
30#endif
31 int cmsg_level;
32 int cmsg_type;
33};
34
35#define SO_DEBUG 11#define SO_DEBUG 1
36#define SO_REUSEADDR 22#define SO_REUSEADDR 2
37#define SO_TYPE 33#define SO_TYPE 3
lib/libc/include/powerpc64-linux-musl/bits/syscall.h+5-1
...@@ -385,6 +385,8 @@...@@ -385,6 +385,8 @@
385#define __NR_fsconfig 431385#define __NR_fsconfig 431
386#define __NR_fsmount 432386#define __NR_fsmount 432
387#define __NR_fspick 433387#define __NR_fspick 433
388#define __NR_pidfd_open 434
389#define __NR_clone3 435
388390
389#define SYS_restart_syscall 0391#define SYS_restart_syscall 0
390#define SYS_exit 1392#define SYS_exit 1
...@@ -772,4 +774,6 @@...@@ -772,4 +774,6 @@
772#define SYS_fsopen 430774#define SYS_fsopen 430
773#define SYS_fsconfig 431775#define SYS_fsconfig 431
774#define SYS_fsmount 432776#define SYS_fsmount 432
775#define SYS_fspick 433
\ No newline at end of file
777#define SYS_fspick 433
778#define SYS_pidfd_open 434
779#define SYS_clone3 435
\ No newline at end of file
lib/libc/include/riscv64-linux-musl/bits/alltypes.h+63-57
...@@ -2,16 +2,8 @@...@@ -2,16 +2,8 @@
2#define _Int64 long2#define _Int64 long
3#define _Reg long3#define _Reg long
44
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)5#define __BYTE_ORDER 1234
6typedef __builtin_va_list va_list;6#define __LONG_MAX 0x7fffffffffffffffL
7#define __DEFINED_va_list
8#endif
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif
14
157
16#ifndef __cplusplus8#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)9#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -48,52 +40,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -48,52 +40,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
48#define __DEFINED_max_align_t40#define __DEFINED_max_align_t
49#endif41#endif
5042
5143#define __LITTLE_ENDIAN 1234
52#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)44#define __BIG_ENDIAN 4321
53typedef long time_t;45#define __USE_TIME_BITS64 1
54#define __DEFINED_time_t
55#endif
56
57#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
58typedef long suseconds_t;
59#define __DEFINED_suseconds_t
60#endif
61
62
63#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
64typedef struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
65#define __DEFINED_pthread_attr_t
66#endif
67
68#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
69typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
70#define __DEFINED_pthread_mutex_t
71#endif
72
73#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
74typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
75#define __DEFINED_mtx_t
76#endif
77
78#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
79typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
80#define __DEFINED_pthread_cond_t
81#endif
82
83#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
84typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
85#define __DEFINED_cnd_t
86#endif
87
88#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
89typedef struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
90#define __DEFINED_pthread_rwlock_t
91#endif
92
93#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
94typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
95#define __DEFINED_pthread_barrier_t
96#endif
9746
98#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)47#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
99typedef unsigned _Addr size_t;48typedef unsigned _Addr size_t;
...@@ -130,6 +79,16 @@ typedef _Reg register_t;...@@ -130,6 +79,16 @@ typedef _Reg register_t;
130#define __DEFINED_register_t79#define __DEFINED_register_t
131#endif80#endif
13281
82#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
83typedef _Int64 time_t;
84#define __DEFINED_time_t
85#endif
86
87#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
88typedef _Int64 suseconds_t;
89#define __DEFINED_suseconds_t
90#endif
91
13392
134#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)93#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
135typedef signed char int8_t;94typedef signed char int8_t;
...@@ -265,7 +224,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -265,7 +224,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
265#endif224#endif
266225
267#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)226#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
268struct timespec { time_t tv_sec; long tv_nsec; };227struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
269#define __DEFINED_struct_timespec228#define __DEFINED_struct_timespec
270#endif229#endif
271230
...@@ -361,6 +320,17 @@ typedef struct _IO_FILE FILE;...@@ -361,6 +320,17 @@ typedef struct _IO_FILE FILE;
361#endif320#endif
362321
363322
323#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
324typedef __builtin_va_list va_list;
325#define __DEFINED_va_list
326#endif
327
328#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
329typedef __builtin_va_list __isoc_va_list;
330#define __DEFINED___isoc_va_list
331#endif
332
333
364#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)334#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
365typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;335typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
366#define __DEFINED_mbstate_t336#define __DEFINED_mbstate_t
...@@ -396,6 +366,42 @@ typedef unsigned short sa_family_t;...@@ -396,6 +366,42 @@ typedef unsigned short sa_family_t;
396#endif366#endif
397367
398368
369#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
370typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
371#define __DEFINED_pthread_attr_t
372#endif
373
374#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
375typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
376#define __DEFINED_pthread_mutex_t
377#endif
378
379#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
380typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
381#define __DEFINED_mtx_t
382#endif
383
384#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
385typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
386#define __DEFINED_pthread_cond_t
387#endif
388
389#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
390typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
391#define __DEFINED_cnd_t
392#endif
393
394#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
395typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
396#define __DEFINED_pthread_rwlock_t
397#endif
398
399#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
400typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
401#define __DEFINED_pthread_barrier_t
402#endif
403
404
399#undef _Addr405#undef _Addr
400#undef _Int64406#undef _Int64
401#undef _Reg407#undef _Reg
\ No newline at end of file
lib/libc/include/riscv64-linux-musl/bits/reg.h deleted-8
...@@ -1,8 +0,0 @@
1#undef __WORDSIZE
2#define __WORDSIZE 64
3#define REG_PC 0
4#define REG_RA 1
5#define REG_SP 2
6#define REG_TP 4
7#define REG_S0 8
8#define REG_A0 10
\ No newline at end of file
lib/libc/include/riscv64-linux-musl/bits/signal.h+9
...@@ -35,6 +35,15 @@ typedef struct mcontext_t {...@@ -35,6 +35,15 @@ typedef struct mcontext_t {
35 union __riscv_mc_fp_state __fpregs;35 union __riscv_mc_fp_state __fpregs;
36} mcontext_t;36} mcontext_t;
3737
38#if defined(_GNU_SOURCE)
39#define REG_PC 0
40#define REG_RA 1
41#define REG_SP 2
42#define REG_TP 4
43#define REG_S0 8
44#define REG_A0 10
45#endif
46
38#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)47#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
39typedef unsigned long greg_t;48typedef unsigned long greg_t;
40typedef unsigned long gregset_t[32];49typedef unsigned long gregset_t[32];
lib/libc/include/riscv64-linux-musl/bits/socket.h deleted-19
...@@ -1,19 +0,0 @@
1#include <endian.h>
2
3struct msghdr {
4 void *msg_name;
5 socklen_t msg_namelen;
6 struct iovec *msg_iov;
7 int msg_iovlen, __pad1;
8 void *msg_control;
9 socklen_t msg_controllen;
10 int __pad2;
11 int msg_flags;
12};
13
14struct cmsghdr {
15 socklen_t cmsg_len;
16 int __pad1;
17 int cmsg_level;
18 int cmsg_type;
19};
\ No newline at end of file
lib/libc/include/riscv64-linux-musl/bits/syscall.h+4
...@@ -287,6 +287,8 @@...@@ -287,6 +287,8 @@
287#define __NR_fsconfig 431287#define __NR_fsconfig 431
288#define __NR_fsmount 432288#define __NR_fsmount 432
289#define __NR_fspick 433289#define __NR_fspick 433
290#define __NR_pidfd_open 434
291#define __NR_clone3 435
290292
291#define __NR_sysriscv __NR_arch_specific_syscall293#define __NR_sysriscv __NR_arch_specific_syscall
292#define __NR_riscv_flush_icache (__NR_sysriscv + 15)294#define __NR_riscv_flush_icache (__NR_sysriscv + 15)
...@@ -579,5 +581,7 @@...@@ -579,5 +581,7 @@
579#define SYS_fsconfig 431581#define SYS_fsconfig 431
580#define SYS_fsmount 432582#define SYS_fsmount 432
581#define SYS_fspick 433583#define SYS_fspick 433
584#define SYS_pidfd_open 434
585#define SYS_clone3 435
582#define SYS_sysriscv __NR_arch_specific_syscall586#define SYS_sysriscv __NR_arch_specific_syscall
583#define SYS_riscv_flush_icache (__NR_sysriscv + 15)587#define SYS_riscv_flush_icache (__NR_sysriscv + 15)
\ No newline at end of file
lib/libc/include/s390x-linux-musl/bits/alltypes.h+63-57
...@@ -2,16 +2,8 @@...@@ -2,16 +2,8 @@
2#define _Int64 long2#define _Int64 long
3#define _Reg long3#define _Reg long
44
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)5#define __BYTE_ORDER 4321
6typedef __builtin_va_list va_list;6#define __LONG_MAX 0x7fffffffffffffffL
7#define __DEFINED_va_list
8#endif
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif
14
157
16#ifndef __cplusplus8#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)9#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -37,52 +29,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -37,52 +29,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
37#define __DEFINED_max_align_t29#define __DEFINED_max_align_t
38#endif30#endif
3931
4032#define __LITTLE_ENDIAN 1234
41#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)33#define __BIG_ENDIAN 4321
42typedef long time_t;34#define __USE_TIME_BITS64 1
43#define __DEFINED_time_t
44#endif
45
46#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
47typedef long suseconds_t;
48#define __DEFINED_suseconds_t
49#endif
50
51
52#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
53typedef struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
54#define __DEFINED_pthread_attr_t
55#endif
56
57#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
58typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
59#define __DEFINED_pthread_mutex_t
60#endif
61
62#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
63typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
64#define __DEFINED_mtx_t
65#endif
66
67#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
68typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
69#define __DEFINED_pthread_cond_t
70#endif
71
72#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
73typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
74#define __DEFINED_cnd_t
75#endif
76
77#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
78typedef struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
79#define __DEFINED_pthread_rwlock_t
80#endif
81
82#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
83typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
84#define __DEFINED_pthread_barrier_t
85#endif
8635
87#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)36#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
88typedef unsigned _Addr size_t;37typedef unsigned _Addr size_t;
...@@ -119,6 +68,16 @@ typedef _Reg register_t;...@@ -119,6 +68,16 @@ typedef _Reg register_t;
119#define __DEFINED_register_t68#define __DEFINED_register_t
120#endif69#endif
12170
71#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
72typedef _Int64 time_t;
73#define __DEFINED_time_t
74#endif
75
76#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
77typedef _Int64 suseconds_t;
78#define __DEFINED_suseconds_t
79#endif
80
12281
123#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)82#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
124typedef signed char int8_t;83typedef signed char int8_t;
...@@ -254,7 +213,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -254,7 +213,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
254#endif213#endif
255214
256#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)215#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
257struct timespec { time_t tv_sec; long tv_nsec; };216struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
258#define __DEFINED_struct_timespec217#define __DEFINED_struct_timespec
259#endif218#endif
260219
...@@ -350,6 +309,17 @@ typedef struct _IO_FILE FILE;...@@ -350,6 +309,17 @@ typedef struct _IO_FILE FILE;
350#endif309#endif
351310
352311
312#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
313typedef __builtin_va_list va_list;
314#define __DEFINED_va_list
315#endif
316
317#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
318typedef __builtin_va_list __isoc_va_list;
319#define __DEFINED___isoc_va_list
320#endif
321
322
353#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)323#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
354typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;324typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
355#define __DEFINED_mbstate_t325#define __DEFINED_mbstate_t
...@@ -385,6 +355,42 @@ typedef unsigned short sa_family_t;...@@ -385,6 +355,42 @@ typedef unsigned short sa_family_t;
385#endif355#endif
386356
387357
358#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
359typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
360#define __DEFINED_pthread_attr_t
361#endif
362
363#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
364typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
365#define __DEFINED_pthread_mutex_t
366#endif
367
368#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
369typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
370#define __DEFINED_mtx_t
371#endif
372
373#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
374typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
375#define __DEFINED_pthread_cond_t
376#endif
377
378#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
379typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
380#define __DEFINED_cnd_t
381#endif
382
383#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
384typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
385#define __DEFINED_pthread_rwlock_t
386#endif
387
388#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
389typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
390#define __DEFINED_pthread_barrier_t
391#endif
392
393
388#undef _Addr394#undef _Addr
389#undef _Int64395#undef _Int64
390#undef _Reg396#undef _Reg
\ No newline at end of file
lib/libc/include/s390x-linux-musl/bits/endian.h deleted-1
...@@ -1 +0,0 @@
1#define __BYTE_ORDER __BIG_ENDIAN
\ No newline at end of file
lib/libc/include/s390x-linux-musl/bits/limits.h+1-8
...@@ -1,8 +1 @@...@@ -1,8 +1 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define PAGESIZE 4096
4#define LONG_BIT 64
5#endif
6
7#define LONG_MAX 0x7fffffffffffffffL
8#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
1#define PAGESIZE 4096
\ No newline at end of file
lib/libc/include/s390x-linux-musl/bits/socket.h deleted-17
...@@ -1,17 +0,0 @@
1struct msghdr {
2 void *msg_name;
3 socklen_t msg_namelen;
4 struct iovec *msg_iov;
5 int __pad1, msg_iovlen;
6 void *msg_control;
7 int __pad2;
8 socklen_t msg_controllen;
9 int msg_flags;
10};
11
12struct cmsghdr {
13 int __pad1;
14 socklen_t cmsg_len;
15 int cmsg_level;
16 int cmsg_type;
17};
\ No newline at end of file
lib/libc/include/s390x-linux-musl/bits/syscall.h+5-1
...@@ -350,6 +350,8 @@...@@ -350,6 +350,8 @@
350#define __NR_fsconfig 431350#define __NR_fsconfig 431
351#define __NR_fsmount 432351#define __NR_fsmount 432
352#define __NR_fspick 433352#define __NR_fspick 433
353#define __NR_pidfd_open 434
354#define __NR_clone3 435
353355
354#define SYS_exit 1356#define SYS_exit 1
355#define SYS_fork 2357#define SYS_fork 2
...@@ -702,4 +704,6 @@...@@ -702,4 +704,6 @@
702#define SYS_fsopen 430704#define SYS_fsopen 430
703#define SYS_fsconfig 431705#define SYS_fsconfig 431
704#define SYS_fsmount 432706#define SYS_fsmount 432
705#define SYS_fspick 433
\ No newline at end of file
707#define SYS_fspick 433
708#define SYS_pidfd_open 434
709#define SYS_clone3 435
\ No newline at end of file
lib/libc/include/x86_64-linux-musl/bits/alltypes.h+63-57
...@@ -2,16 +2,8 @@...@@ -2,16 +2,8 @@
2#define _Int64 long2#define _Int64 long
3#define _Reg long3#define _Reg long
44
5#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)5#define __BYTE_ORDER 1234
6typedef __builtin_va_list va_list;6#define __LONG_MAX 0x7fffffffffffffffL
7#define __DEFINED_va_list
8#endif
9
10#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
11typedef __builtin_va_list __isoc_va_list;
12#define __DEFINED___isoc_va_list
13#endif
14
157
16#ifndef __cplusplus8#ifndef __cplusplus
17#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)9#if defined(__NEED_wchar_t) && !defined(__DEFINED_wchar_t)
...@@ -50,52 +42,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;...@@ -50,52 +42,9 @@ typedef struct { long long __ll; long double __ld; } max_align_t;
50#define __DEFINED_max_align_t42#define __DEFINED_max_align_t
51#endif43#endif
5244
5345#define __LITTLE_ENDIAN 1234
54#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)46#define __BIG_ENDIAN 4321
55typedef long time_t;47#define __USE_TIME_BITS64 1
56#define __DEFINED_time_t
57#endif
58
59#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
60typedef long suseconds_t;
61#define __DEFINED_suseconds_t
62#endif
63
64
65#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
66typedef struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
67#define __DEFINED_pthread_attr_t
68#endif
69
70#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
71typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
72#define __DEFINED_pthread_mutex_t
73#endif
74
75#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
76typedef struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
77#define __DEFINED_mtx_t
78#endif
79
80#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
81typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
82#define __DEFINED_pthread_cond_t
83#endif
84
85#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
86typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
87#define __DEFINED_cnd_t
88#endif
89
90#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
91typedef struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
92#define __DEFINED_pthread_rwlock_t
93#endif
94
95#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
96typedef struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;
97#define __DEFINED_pthread_barrier_t
98#endif
9948
100#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)49#if defined(__NEED_size_t) && !defined(__DEFINED_size_t)
101typedef unsigned _Addr size_t;50typedef unsigned _Addr size_t;
...@@ -132,6 +81,16 @@ typedef _Reg register_t;...@@ -132,6 +81,16 @@ typedef _Reg register_t;
132#define __DEFINED_register_t81#define __DEFINED_register_t
133#endif82#endif
13483
84#if defined(__NEED_time_t) && !defined(__DEFINED_time_t)
85typedef _Int64 time_t;
86#define __DEFINED_time_t
87#endif
88
89#if defined(__NEED_suseconds_t) && !defined(__DEFINED_suseconds_t)
90typedef _Int64 suseconds_t;
91#define __DEFINED_suseconds_t
92#endif
93
13594
136#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)95#if defined(__NEED_int8_t) && !defined(__DEFINED_int8_t)
137typedef signed char int8_t;96typedef signed char int8_t;
...@@ -267,7 +226,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };...@@ -267,7 +226,7 @@ struct timeval { time_t tv_sec; suseconds_t tv_usec; };
267#endif226#endif
268227
269#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)228#if defined(__NEED_struct_timespec) && !defined(__DEFINED_struct_timespec)
270struct timespec { time_t tv_sec; long tv_nsec; };229struct timespec { time_t tv_sec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER==4321); long tv_nsec; int :8*(sizeof(time_t)-sizeof(long))*(__BYTE_ORDER!=4321); };
271#define __DEFINED_struct_timespec230#define __DEFINED_struct_timespec
272#endif231#endif
273232
...@@ -363,6 +322,17 @@ typedef struct _IO_FILE FILE;...@@ -363,6 +322,17 @@ typedef struct _IO_FILE FILE;
363#endif322#endif
364323
365324
325#if defined(__NEED_va_list) && !defined(__DEFINED_va_list)
326typedef __builtin_va_list va_list;
327#define __DEFINED_va_list
328#endif
329
330#if defined(__NEED___isoc_va_list) && !defined(__DEFINED___isoc_va_list)
331typedef __builtin_va_list __isoc_va_list;
332#define __DEFINED___isoc_va_list
333#endif
334
335
366#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)336#if defined(__NEED_mbstate_t) && !defined(__DEFINED_mbstate_t)
367typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;337typedef struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
368#define __DEFINED_mbstate_t338#define __DEFINED_mbstate_t
...@@ -398,6 +368,42 @@ typedef unsigned short sa_family_t;...@@ -398,6 +368,42 @@ typedef unsigned short sa_family_t;
398#endif368#endif
399369
400370
371#if defined(__NEED_pthread_attr_t) && !defined(__DEFINED_pthread_attr_t)
372typedef struct { union { int __i[sizeof(long)==8?14:9]; volatile int __vi[sizeof(long)==8?14:9]; unsigned long __s[sizeof(long)==8?7:9]; } __u; } pthread_attr_t;
373#define __DEFINED_pthread_attr_t
374#endif
375
376#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
377typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } pthread_mutex_t;
378#define __DEFINED_pthread_mutex_t
379#endif
380
381#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
382typedef struct { union { int __i[sizeof(long)==8?10:6]; volatile int __vi[sizeof(long)==8?10:6]; volatile void *volatile __p[sizeof(long)==8?5:6]; } __u; } mtx_t;
383#define __DEFINED_mtx_t
384#endif
385
386#if defined(__NEED_pthread_cond_t) && !defined(__DEFINED_pthread_cond_t)
387typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } pthread_cond_t;
388#define __DEFINED_pthread_cond_t
389#endif
390
391#if defined(__NEED_cnd_t) && !defined(__DEFINED_cnd_t)
392typedef struct { union { int __i[12]; volatile int __vi[12]; void *__p[12*sizeof(int)/sizeof(void*)]; } __u; } cnd_t;
393#define __DEFINED_cnd_t
394#endif
395
396#if defined(__NEED_pthread_rwlock_t) && !defined(__DEFINED_pthread_rwlock_t)
397typedef struct { union { int __i[sizeof(long)==8?14:8]; volatile int __vi[sizeof(long)==8?14:8]; void *__p[sizeof(long)==8?7:8]; } __u; } pthread_rwlock_t;
398#define __DEFINED_pthread_rwlock_t
399#endif
400
401#if defined(__NEED_pthread_barrier_t) && !defined(__DEFINED_pthread_barrier_t)
402typedef struct { union { int __i[sizeof(long)==8?8:5]; volatile int __vi[sizeof(long)==8?8:5]; void *__p[sizeof(long)==8?4:5]; } __u; } pthread_barrier_t;
403#define __DEFINED_pthread_barrier_t
404#endif
405
406
401#undef _Addr407#undef _Addr
402#undef _Int64408#undef _Int64
403#undef _Reg409#undef _Reg
\ No newline at end of file
lib/libc/include/x86_64-linux-musl/bits/limits.h+1-8
...@@ -1,8 +1 @@...@@ -1,8 +1 @@
1#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
2 || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
3#define PAGESIZE 4096
4#define LONG_BIT 64
5#endif
6
7#define LONG_MAX 0x7fffffffffffffffL
8#define LLONG_MAX 0x7fffffffffffffffLL
\ No newline at end of file
1#define PAGESIZE 4096
\ No newline at end of file
lib/libc/include/x86_64-linux-musl/bits/socket.h deleted-16
...@@ -1,16 +0,0 @@
1struct msghdr {
2 void *msg_name;
3 socklen_t msg_namelen;
4 struct iovec *msg_iov;
5 int msg_iovlen, __pad1;
6 void *msg_control;
7 socklen_t msg_controllen, __pad2;
8 int msg_flags;
9};
10
11struct cmsghdr {
12 socklen_t cmsg_len;
13 int __pad1;
14 int cmsg_level;
15 int cmsg_type;
16};
\ No newline at end of file
lib/libc/include/x86_64-linux-musl/bits/syscall.h+5-1
...@@ -343,6 +343,8 @@...@@ -343,6 +343,8 @@
343#define __NR_fsconfig 431343#define __NR_fsconfig 431
344#define __NR_fsmount 432344#define __NR_fsmount 432
345#define __NR_fspick 433345#define __NR_fspick 433
346#define __NR_pidfd_open 434
347#define __NR_clone3 435
346348
347#define SYS_read 0349#define SYS_read 0
348#define SYS_write 1350#define SYS_write 1
...@@ -688,4 +690,6 @@...@@ -688,4 +690,6 @@
688#define SYS_fsopen 430690#define SYS_fsopen 430
689#define SYS_fsconfig 431691#define SYS_fsconfig 431
690#define SYS_fsmount 432692#define SYS_fsmount 432
691#define SYS_fspick 433
\ No newline at end of file
693#define SYS_fspick 433
694#define SYS_pidfd_open 434
695#define SYS_clone3 435
\ No newline at end of file