diff options
Diffstat (limited to 'toolchain/musl/patches')
-rw-r--r-- | toolchain/musl/patches/musl-git-20140307.patch (renamed from toolchain/musl/patches/musl-git-20140301.patch) | 555 |
1 files changed, 330 insertions, 225 deletions
diff --git a/toolchain/musl/patches/musl-git-20140301.patch b/toolchain/musl/patches/musl-git-20140307.patch index 1362c9ba9..0cf790196 100644 --- a/toolchain/musl/patches/musl-git-20140301.patch +++ b/toolchain/musl/patches/musl-git-20140307.patch @@ -1,6 +1,6 @@ diff -Nur musl-0.9.15/arch/arm/bits/shm.h musl-git/arch/arm/bits/shm.h --- musl-0.9.15/arch/arm/bits/shm.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/arm/bits/shm.h 2014-03-01 08:58:13.000000000 +0100 ++++ musl-git/arch/arm/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -16,3 +16,14 @@ unsigned long __pad1; unsigned long __pad2; @@ -18,7 +18,7 @@ diff -Nur musl-0.9.15/arch/arm/bits/shm.h musl-git/arch/arm/bits/shm.h + diff -Nur musl-0.9.15/arch/arm/bits/termios.h musl-git/arch/arm/bits/termios.h --- musl-0.9.15/arch/arm/bits/termios.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/arm/bits/termios.h 2014-03-01 08:58:13.000000000 +0100 ++++ musl-git/arch/arm/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -42,6 +42,7 @@ #define IXANY 0004000 #define IXOFF 0010000 @@ -74,7 +74,7 @@ diff -Nur musl-0.9.15/arch/arm/bits/termios.h musl-git/arch/arm/bits/termios.h +#endif diff -Nur musl-0.9.15/arch/arm/syscall_arch.h musl-git/arch/arm/syscall_arch.h --- musl-0.9.15/arch/arm/syscall_arch.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/arm/syscall_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/arm/syscall_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -3,6 +3,8 @@ ((union { long long ll; long l[2]; }){ .ll = x }).l[1] #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x)) @@ -86,7 +86,7 @@ diff -Nur musl-0.9.15/arch/arm/syscall_arch.h musl-git/arch/arm/syscall_arch.h #define __asm_syscall(...) do { \ diff -Nur musl-0.9.15/arch/i386/bits/shm.h musl-git/arch/i386/bits/shm.h --- musl-0.9.15/arch/i386/bits/shm.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/i386/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/i386/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -16,3 +16,14 @@ unsigned long __pad1; unsigned long __pad2; @@ -104,7 +104,7 @@ diff -Nur musl-0.9.15/arch/i386/bits/shm.h musl-git/arch/i386/bits/shm.h + diff -Nur musl-0.9.15/arch/i386/bits/termios.h musl-git/arch/i386/bits/termios.h --- musl-0.9.15/arch/i386/bits/termios.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/i386/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/i386/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -42,6 +42,7 @@ #define IXANY 0004000 #define IXOFF 0010000 @@ -160,7 +160,7 @@ diff -Nur musl-0.9.15/arch/i386/bits/termios.h musl-git/arch/i386/bits/termios.h +#endif diff -Nur musl-0.9.15/arch/microblaze/bits/shm.h musl-git/arch/microblaze/bits/shm.h --- musl-0.9.15/arch/microblaze/bits/shm.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/microblaze/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/microblaze/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -16,3 +16,14 @@ unsigned long __pad1; unsigned long __pad2; @@ -178,7 +178,7 @@ diff -Nur musl-0.9.15/arch/microblaze/bits/shm.h musl-git/arch/microblaze/bits/s + diff -Nur musl-0.9.15/arch/microblaze/bits/termios.h musl-git/arch/microblaze/bits/termios.h --- musl-0.9.15/arch/microblaze/bits/termios.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/microblaze/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/microblaze/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -42,6 +42,7 @@ #define IXANY 0004000 #define IXOFF 0010000 @@ -234,7 +234,7 @@ diff -Nur musl-0.9.15/arch/microblaze/bits/termios.h musl-git/arch/microblaze/bi +#endif diff -Nur musl-0.9.15/arch/microblaze/syscall_arch.h musl-git/arch/microblaze/syscall_arch.h --- musl-0.9.15/arch/microblaze/syscall_arch.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/microblaze/syscall_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/microblaze/syscall_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -3,6 +3,8 @@ ((union { long long ll; long l[2]; }){ .ll = x }).l[1] #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x)) @@ -246,7 +246,7 @@ diff -Nur musl-0.9.15/arch/microblaze/syscall_arch.h musl-git/arch/microblaze/sy static __inline long __syscall0(long n) diff -Nur musl-0.9.15/arch/mips/bits/fenv.h musl-git/arch/mips/bits/fenv.h --- musl-0.9.15/arch/mips/bits/fenv.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/mips/bits/fenv.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/mips/bits/fenv.h 2014-03-07 14:03:57.000000000 +0100 @@ -1,3 +1,7 @@ +#ifdef __mips_soft_float +#define FE_ALL_EXCEPT 0 @@ -265,7 +265,7 @@ diff -Nur musl-0.9.15/arch/mips/bits/fenv.h musl-git/arch/mips/bits/fenv.h diff -Nur musl-0.9.15/arch/mips/bits/shm.h musl-git/arch/mips/bits/shm.h --- musl-0.9.15/arch/mips/bits/shm.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/mips/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/mips/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -13,3 +13,14 @@ unsigned long __pad1; unsigned long __pad2; @@ -283,7 +283,7 @@ diff -Nur musl-0.9.15/arch/mips/bits/shm.h musl-git/arch/mips/bits/shm.h + diff -Nur musl-0.9.15/arch/mips/bits/termios.h musl-git/arch/mips/bits/termios.h --- musl-0.9.15/arch/mips/bits/termios.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/mips/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/mips/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -77,9 +77,6 @@ #define VT0 0000000 #define VT1 0040000 @@ -334,7 +334,7 @@ diff -Nur musl-0.9.15/arch/mips/bits/termios.h musl-git/arch/mips/bits/termios.h +#endif diff -Nur musl-0.9.15/arch/mips/reloc.h musl-git/arch/mips/reloc.h --- musl-0.9.15/arch/mips/reloc.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/mips/reloc.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/mips/reloc.h 2014-03-07 14:03:57.000000000 +0100 @@ -8,7 +8,13 @@ #define ENDIAN_SUFFIX "" #endif @@ -352,7 +352,7 @@ diff -Nur musl-0.9.15/arch/mips/reloc.h musl-git/arch/mips/reloc.h #define IS_PLT(x) 1 diff -Nur musl-0.9.15/arch/mips/syscall_arch.h musl-git/arch/mips/syscall_arch.h --- musl-0.9.15/arch/mips/syscall_arch.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/mips/syscall_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/mips/syscall_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -3,6 +3,8 @@ ((union { long long ll; long l[2]; }){ .ll = x }).l[1] #define __SYSCALL_LL_O(x) 0, __SYSCALL_LL_E((x)) @@ -364,7 +364,7 @@ diff -Nur musl-0.9.15/arch/mips/syscall_arch.h musl-git/arch/mips/syscall_arch.h #define __asm_syscall(...) do { \ diff -Nur musl-0.9.15/arch/powerpc/bits/shm.h musl-git/arch/powerpc/bits/shm.h --- musl-0.9.15/arch/powerpc/bits/shm.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/powerpc/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/powerpc/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -16,3 +16,14 @@ unsigned long __pad1; unsigned long __pad2; @@ -382,7 +382,7 @@ diff -Nur musl-0.9.15/arch/powerpc/bits/shm.h musl-git/arch/powerpc/bits/shm.h + diff -Nur musl-0.9.15/arch/powerpc/bits/termios.h musl-git/arch/powerpc/bits/termios.h --- musl-0.9.15/arch/powerpc/bits/termios.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/powerpc/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/powerpc/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -66,7 +66,6 @@ #define TAB1 00002000 #define TAB2 00004000 @@ -442,7 +442,7 @@ diff -Nur musl-0.9.15/arch/powerpc/bits/termios.h musl-git/arch/powerpc/bits/ter +#endif diff -Nur musl-0.9.15/arch/sh/atomic.h musl-git/arch/sh/atomic.h --- musl-0.9.15/arch/sh/atomic.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/atomic.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/atomic.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,87 @@ +#ifndef _INTERNAL_ATOMIC_H +#define _INTERNAL_ATOMIC_H @@ -533,7 +533,7 @@ diff -Nur musl-0.9.15/arch/sh/atomic.h musl-git/arch/sh/atomic.h +#endif diff -Nur musl-0.9.15/arch/sh/bits/alltypes.h.in musl-git/arch/sh/bits/alltypes.h.in --- musl-0.9.15/arch/sh/bits/alltypes.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/alltypes.h.in 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/alltypes.h.in 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,23 @@ +#define _Addr int +#define _Int64 long long @@ -560,7 +560,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/alltypes.h.in musl-git/arch/sh/bits/alltypes. +TYPEDEF struct { union { int __i[5]; void *__p[5]; } __u; } pthread_barrier_t; diff -Nur musl-0.9.15/arch/sh/bits/endian.h musl-git/arch/sh/bits/endian.h --- musl-0.9.15/arch/sh/bits/endian.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/endian.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/endian.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,5 @@ +#if __BIG_ENDIAN__ +#define __BYTE_ORDER __BIG_ENDIAN @@ -569,7 +569,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/endian.h musl-git/arch/sh/bits/endian.h +#endif diff -Nur musl-0.9.15/arch/sh/bits/errno.h musl-git/arch/sh/bits/errno.h --- musl-0.9.15/arch/sh/bits/errno.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/errno.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/errno.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,134 @@ +#define EPERM 1 +#define ENOENT 2 @@ -707,7 +707,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/errno.h musl-git/arch/sh/bits/errno.h +#define EHWPOISON 133 diff -Nur musl-0.9.15/arch/sh/bits/fcntl.h musl-git/arch/sh/bits/fcntl.h --- musl-0.9.15/arch/sh/bits/fcntl.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/fcntl.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/fcntl.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,39 @@ +#define O_CREAT 0100 +#define O_EXCL 0200 @@ -750,7 +750,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/fcntl.h musl-git/arch/sh/bits/fcntl.h +#define F_GETOWNER_UIDS 17 diff -Nur musl-0.9.15/arch/sh/bits/fenv.h musl-git/arch/sh/bits/fenv.h --- musl-0.9.15/arch/sh/bits/fenv.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/fenv.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/fenv.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,26 @@ +#ifndef __SH_FPU_ANY__ + @@ -780,7 +780,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/fenv.h musl-git/arch/sh/bits/fenv.h +#define FE_DFL_ENV ((const fenv_t *) -1) diff -Nur musl-0.9.15/arch/sh/bits/float.h musl-git/arch/sh/bits/float.h --- musl-0.9.15/arch/sh/bits/float.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/float.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/float.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,17 @@ +#define FLT_ROUNDS 1 +#define FLT_EVAL_METHOD 0 @@ -801,7 +801,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/float.h musl-git/arch/sh/bits/float.h +#define DECIMAL_DIG 17 diff -Nur musl-0.9.15/arch/sh/bits/ioctl.h musl-git/arch/sh/bits/ioctl.h --- musl-0.9.15/arch/sh/bits/ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/ioctl.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/ioctl.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,205 @@ +#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) ) +#define _IOC_NONE 0U @@ -1010,7 +1010,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/ioctl.h musl-git/arch/sh/bits/ioctl.h +#define SIOCPROTOPRIVATE 0x89E0 diff -Nur musl-0.9.15/arch/sh/bits/ipc.h musl-git/arch/sh/bits/ipc.h --- musl-0.9.15/arch/sh/bits/ipc.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/ipc.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/ipc.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,14 @@ +struct ipc_perm +{ @@ -1028,7 +1028,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/ipc.h musl-git/arch/sh/bits/ipc.h +#define IPC_64 0x100 diff -Nur musl-0.9.15/arch/sh/bits/limits.h musl-git/arch/sh/bits/limits.h --- musl-0.9.15/arch/sh/bits/limits.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/limits.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/limits.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,8 @@ +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) @@ -1040,7 +1040,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/limits.h musl-git/arch/sh/bits/limits.h +#define LLONG_MAX 0x7fffffffffffffffLL diff -Nur musl-0.9.15/arch/sh/bits/mman.h musl-git/arch/sh/bits/mman.h --- musl-0.9.15/arch/sh/bits/mman.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/mman.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/mman.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,62 @@ +#define MAP_FAILED ((void *) -1) + @@ -1106,7 +1106,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/mman.h musl-git/arch/sh/bits/mman.h +#endif diff -Nur musl-0.9.15/arch/sh/bits/msg.h musl-git/arch/sh/bits/msg.h --- musl-0.9.15/arch/sh/bits/msg.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/msg.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/msg.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,16 @@ +struct msqid_ds +{ @@ -1126,18 +1126,18 @@ diff -Nur musl-0.9.15/arch/sh/bits/msg.h musl-git/arch/sh/bits/msg.h +}; diff -Nur musl-0.9.15/arch/sh/bits/posix.h musl-git/arch/sh/bits/posix.h --- musl-0.9.15/arch/sh/bits/posix.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/posix.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/posix.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,2 @@ +#define _POSIX_V6_ILP32_OFFBIG 1 +#define _POSIX_V7_ILP32_OFFBIG 1 diff -Nur musl-0.9.15/arch/sh/bits/setjmp.h musl-git/arch/sh/bits/setjmp.h --- musl-0.9.15/arch/sh/bits/setjmp.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/setjmp.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/setjmp.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1 @@ +typedef unsigned long __jmp_buf[13]; diff -Nur musl-0.9.15/arch/sh/bits/shm.h musl-git/arch/sh/bits/shm.h --- musl-0.9.15/arch/sh/bits/shm.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,28 @@ +#define SHMLBA 16384 + @@ -1169,7 +1169,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/shm.h musl-git/arch/sh/bits/shm.h +}; diff -Nur musl-0.9.15/arch/sh/bits/signal.h musl-git/arch/sh/bits/signal.h --- musl-0.9.15/arch/sh/bits/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/signal.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/signal.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,76 @@ +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) @@ -1249,7 +1249,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/signal.h musl-git/arch/sh/bits/signal.h +#define _NSIG 65 diff -Nur musl-0.9.15/arch/sh/bits/socket.h musl-git/arch/sh/bits/socket.h --- musl-0.9.15/arch/sh/bits/socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/socket.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/socket.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,17 @@ +struct msghdr +{ @@ -1270,7 +1270,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/socket.h musl-git/arch/sh/bits/socket.h +}; diff -Nur musl-0.9.15/arch/sh/bits/statfs.h musl-git/arch/sh/bits/statfs.h --- musl-0.9.15/arch/sh/bits/statfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/statfs.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/statfs.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,7 @@ +struct statfs { + unsigned long f_type, f_bsize; @@ -1281,7 +1281,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/statfs.h musl-git/arch/sh/bits/statfs.h +}; diff -Nur musl-0.9.15/arch/sh/bits/stat.h musl-git/arch/sh/bits/stat.h --- musl-0.9.15/arch/sh/bits/stat.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/stat.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/stat.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,22 @@ +/* copied from kernel definition, but with padding replaced + * by the corresponding correctly-sized userspace types. */ @@ -1307,7 +1307,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/stat.h musl-git/arch/sh/bits/stat.h +}; diff -Nur musl-0.9.15/arch/sh/bits/stdarg.h musl-git/arch/sh/bits/stdarg.h --- musl-0.9.15/arch/sh/bits/stdarg.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/stdarg.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/stdarg.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,4 @@ +#define va_start(v,l) __builtin_va_start(v,l) +#define va_end(v) __builtin_va_end(v) @@ -1315,7 +1315,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/stdarg.h musl-git/arch/sh/bits/stdarg.h +#define va_copy(d,s) __builtin_va_copy(d,s) diff -Nur musl-0.9.15/arch/sh/bits/stdint.h musl-git/arch/sh/bits/stdint.h --- musl-0.9.15/arch/sh/bits/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/stdint.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/stdint.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,20 @@ +typedef int32_t int_fast16_t; +typedef int32_t int_fast32_t; @@ -1339,7 +1339,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/stdint.h musl-git/arch/sh/bits/stdint.h +#define SIZE_MAX UINT32_MAX diff -Nur musl-0.9.15/arch/sh/bits/syscall.h musl-git/arch/sh/bits/syscall.h --- musl-0.9.15/arch/sh/bits/syscall.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/syscall.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/syscall.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,684 @@ +#define __NR_restart_syscall 0 +#define __NR_exit 1 @@ -2027,7 +2027,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/syscall.h musl-git/arch/sh/bits/syscall.h +#define SYS_finit_module 368 diff -Nur musl-0.9.15/arch/sh/bits/termios.h musl-git/arch/sh/bits/termios.h --- musl-0.9.15/arch/sh/bits/termios.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,160 @@ +struct termios +{ @@ -2191,7 +2191,7 @@ diff -Nur musl-0.9.15/arch/sh/bits/termios.h musl-git/arch/sh/bits/termios.h +#endif diff -Nur musl-0.9.15/arch/sh/crt_arch.h musl-git/arch/sh/crt_arch.h --- musl-0.9.15/arch/sh/crt_arch.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/crt_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/crt_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,9 @@ +__asm__("\ +.global _start \n\ @@ -2204,7 +2204,7 @@ diff -Nur musl-0.9.15/arch/sh/crt_arch.h musl-git/arch/sh/crt_arch.h +"); diff -Nur musl-0.9.15/arch/sh/pthread_arch.h musl-git/arch/sh/pthread_arch.h --- musl-0.9.15/arch/sh/pthread_arch.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/pthread_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/pthread_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,11 @@ +static inline struct pthread *__pthread_self() +{ @@ -2219,7 +2219,7 @@ diff -Nur musl-0.9.15/arch/sh/pthread_arch.h musl-git/arch/sh/pthread_arch.h +#define CANCEL_REG_IP 17 diff -Nur musl-0.9.15/arch/sh/reloc.h musl-git/arch/sh/reloc.h --- musl-0.9.15/arch/sh/reloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/reloc.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/reloc.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,47 @@ +#if __BYTE_ORDER == __BIG_ENDIAN +#define ENDIAN_SUFFIX "eb" @@ -2270,7 +2270,7 @@ diff -Nur musl-0.9.15/arch/sh/reloc.h musl-git/arch/sh/reloc.h +} diff -Nur musl-0.9.15/arch/sh/src/atomic.c musl-git/arch/sh/src/atomic.c --- musl-0.9.15/arch/sh/src/atomic.c 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/src/atomic.c 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/src/atomic.c 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,146 @@ +#include "libc.h" + @@ -2420,13 +2420,13 @@ diff -Nur musl-0.9.15/arch/sh/src/atomic.c musl-git/arch/sh/src/atomic.c +} diff -Nur musl-0.9.15/arch/sh/src/__fpsrc_values.c musl-git/arch/sh/src/__fpsrc_values.c --- musl-0.9.15/arch/sh/src/__fpsrc_values.c 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/src/__fpsrc_values.c 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/src/__fpsrc_values.c 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,2 @@ +/* used by gcc for switching the FPU between single and double precision */ +const unsigned long __fpscr_values[2] = { 0, 0x80000 }; diff -Nur musl-0.9.15/arch/sh/syscall_arch.h musl-git/arch/sh/syscall_arch.h --- musl-0.9.15/arch/sh/syscall_arch.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/sh/syscall_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/sh/syscall_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,87 @@ +#define __SYSCALL_LL_E(x) \ +((union { long long ll; long l[2]; }){ .ll = x }).l[0], \ @@ -2517,7 +2517,7 @@ diff -Nur musl-0.9.15/arch/sh/syscall_arch.h musl-git/arch/sh/syscall_arch.h +} diff -Nur musl-0.9.15/arch/x32/atomic.h musl-git/arch/x32/atomic.h --- musl-0.9.15/arch/x32/atomic.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/atomic.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/atomic.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,125 @@ +#ifndef _INTERNAL_ATOMIC_H +#define _INTERNAL_ATOMIC_H @@ -2646,7 +2646,7 @@ diff -Nur musl-0.9.15/arch/x32/atomic.h musl-git/arch/x32/atomic.h +#endif diff -Nur musl-0.9.15/arch/x32/bits/alltypes.h.in musl-git/arch/x32/bits/alltypes.h.in --- musl-0.9.15/arch/x32/bits/alltypes.h.in 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/alltypes.h.in 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/alltypes.h.in 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,28 @@ +#define _Addr int +#define _Int64 long long @@ -2678,12 +2678,12 @@ diff -Nur musl-0.9.15/arch/x32/bits/alltypes.h.in musl-git/arch/x32/bits/alltype +TYPEDEF struct { union { int __i[8]; void *__p[4]; } __u; } pthread_barrier_t; diff -Nur musl-0.9.15/arch/x32/bits/endian.h musl-git/arch/x32/bits/endian.h --- musl-0.9.15/arch/x32/bits/endian.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/endian.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/endian.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1 @@ +#define __BYTE_ORDER __LITTLE_ENDIAN diff -Nur musl-0.9.15/arch/x32/bits/errno.h musl-git/arch/x32/bits/errno.h --- musl-0.9.15/arch/x32/bits/errno.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/errno.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/errno.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,134 @@ +#define EPERM 1 +#define ENOENT 2 @@ -2821,7 +2821,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/errno.h musl-git/arch/x32/bits/errno.h +#define EHWPOISON 133 diff -Nur musl-0.9.15/arch/x32/bits/fcntl.h musl-git/arch/x32/bits/fcntl.h --- musl-0.9.15/arch/x32/bits/fcntl.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/fcntl.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/fcntl.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,39 @@ +#define O_CREAT 0100 +#define O_EXCL 0200 @@ -2864,7 +2864,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/fcntl.h musl-git/arch/x32/bits/fcntl.h +#define F_GETOWNER_UIDS 17 diff -Nur musl-0.9.15/arch/x32/bits/fenv.h musl-git/arch/x32/bits/fenv.h --- musl-0.9.15/arch/x32/bits/fenv.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/fenv.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/fenv.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,34 @@ +#define FE_INVALID 1 +#define __FE_DENORM 2 @@ -2902,7 +2902,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/fenv.h musl-git/arch/x32/bits/fenv.h +#define FE_DFL_ENV ((const fenv_t *) -1) diff -Nur musl-0.9.15/arch/x32/bits/float.h musl-git/arch/x32/bits/float.h --- musl-0.9.15/arch/x32/bits/float.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/float.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/float.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,21 @@ +#define FLT_ROUNDS 1 +#ifdef __FLT_EVAL_METHOD__ @@ -2927,7 +2927,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/float.h musl-git/arch/x32/bits/float.h +#define DECIMAL_DIG 21 diff -Nur musl-0.9.15/arch/x32/bits/ioctl.h musl-git/arch/x32/bits/ioctl.h --- musl-0.9.15/arch/x32/bits/ioctl.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/ioctl.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/ioctl.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,197 @@ +#define _IOC(a,b,c,d) ( ((a)<<30) | ((b)<<8) | (c) | ((d)<<16) ) +#define _IOC_NONE 0U @@ -3128,7 +3128,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/ioctl.h musl-git/arch/x32/bits/ioctl.h +#define SIOCPROTOPRIVATE 0x89E0 diff -Nur musl-0.9.15/arch/x32/bits/io.h musl-git/arch/x32/bits/io.h --- musl-0.9.15/arch/x32/bits/io.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/io.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/io.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,77 @@ +static __inline void outb(unsigned char __val, unsigned short __port) +{ @@ -3209,7 +3209,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/io.h musl-git/arch/x32/bits/io.h +} diff -Nur musl-0.9.15/arch/x32/bits/ipc.h musl-git/arch/x32/bits/ipc.h --- musl-0.9.15/arch/x32/bits/ipc.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/ipc.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/ipc.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,14 @@ +struct ipc_perm +{ @@ -3227,7 +3227,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/ipc.h musl-git/arch/x32/bits/ipc.h +#define IPC_64 0 diff -Nur musl-0.9.15/arch/x32/bits/limits.h musl-git/arch/x32/bits/limits.h --- musl-0.9.15/arch/x32/bits/limits.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/limits.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/limits.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,8 @@ +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) @@ -3239,7 +3239,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/limits.h musl-git/arch/x32/bits/limits.h +#define LLONG_MAX 0x7fffffffffffffffLL diff -Nur musl-0.9.15/arch/x32/bits/mman.h musl-git/arch/x32/bits/mman.h --- musl-0.9.15/arch/x32/bits/mman.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/mman.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/mman.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,62 @@ +#define MAP_FAILED ((void *) -1) + @@ -3305,7 +3305,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/mman.h musl-git/arch/x32/bits/mman.h +#endif diff -Nur musl-0.9.15/arch/x32/bits/msg.h musl-git/arch/x32/bits/msg.h --- musl-0.9.15/arch/x32/bits/msg.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/msg.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/msg.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,16 @@ +struct msqid_ds +{ @@ -3325,13 +3325,13 @@ diff -Nur musl-0.9.15/arch/x32/bits/msg.h musl-git/arch/x32/bits/msg.h +}; diff -Nur musl-0.9.15/arch/x32/bits/posix.h musl-git/arch/x32/bits/posix.h --- musl-0.9.15/arch/x32/bits/posix.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/posix.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/posix.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,2 @@ +#define _POSIX_V6_LP64_OFF64 1 +#define _POSIX_V7_LP64_OFF64 1 diff -Nur musl-0.9.15/arch/x32/bits/reg.h musl-git/arch/x32/bits/reg.h --- musl-0.9.15/arch/x32/bits/reg.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/reg.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/reg.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,29 @@ +#undef __WORDSIZE +#define __WORDSIZE 32 @@ -3364,12 +3364,12 @@ diff -Nur musl-0.9.15/arch/x32/bits/reg.h musl-git/arch/x32/bits/reg.h +#define GS 26 diff -Nur musl-0.9.15/arch/x32/bits/setjmp.h musl-git/arch/x32/bits/setjmp.h --- musl-0.9.15/arch/x32/bits/setjmp.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/setjmp.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/setjmp.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1 @@ +typedef unsigned long long __jmp_buf[8]; diff -Nur musl-0.9.15/arch/x32/bits/shm.h musl-git/arch/x32/bits/shm.h --- musl-0.9.15/arch/x32/bits/shm.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,33 @@ +#define SHMLBA 4096 + @@ -3406,7 +3406,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/shm.h musl-git/arch/x32/bits/shm.h +; diff -Nur musl-0.9.15/arch/x32/bits/signal.h musl-git/arch/x32/bits/signal.h --- musl-0.9.15/arch/x32/bits/signal.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/signal.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/signal.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,119 @@ +#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ + || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE) @@ -3529,7 +3529,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/signal.h musl-git/arch/x32/bits/signal.h + diff -Nur musl-0.9.15/arch/x32/bits/socket.h musl-git/arch/x32/bits/socket.h --- musl-0.9.15/arch/x32/bits/socket.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/socket.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/socket.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,18 @@ +struct msghdr +{ @@ -3551,7 +3551,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/socket.h musl-git/arch/x32/bits/socket.h +}; diff -Nur musl-0.9.15/arch/x32/bits/statfs.h musl-git/arch/x32/bits/statfs.h --- musl-0.9.15/arch/x32/bits/statfs.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/statfs.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/statfs.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,7 @@ +struct statfs { + unsigned long f_type, f_bsize; @@ -3562,7 +3562,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/statfs.h musl-git/arch/x32/bits/statfs.h +}; diff -Nur musl-0.9.15/arch/x32/bits/stat.h musl-git/arch/x32/bits/stat.h --- musl-0.9.15/arch/x32/bits/stat.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/stat.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/stat.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,22 @@ +/* copied from kernel definition, but with padding replaced + * by the corresponding correctly-sized userspace types. */ @@ -3588,7 +3588,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/stat.h musl-git/arch/x32/bits/stat.h +}; diff -Nur musl-0.9.15/arch/x32/bits/stdarg.h musl-git/arch/x32/bits/stdarg.h --- musl-0.9.15/arch/x32/bits/stdarg.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/stdarg.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/stdarg.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,4 @@ +#define va_start(v,l) __builtin_va_start(v,l) +#define va_end(v) __builtin_va_end(v) @@ -3596,7 +3596,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/stdarg.h musl-git/arch/x32/bits/stdarg.h +#define va_copy(d,s) __builtin_va_copy(d,s) diff -Nur musl-0.9.15/arch/x32/bits/stdint.h musl-git/arch/x32/bits/stdint.h --- musl-0.9.15/arch/x32/bits/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/stdint.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/stdint.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,20 @@ +typedef int32_t int_fast16_t; +typedef int32_t int_fast32_t; @@ -3620,7 +3620,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/stdint.h musl-git/arch/x32/bits/stdint.h +#define SIZE_MAX UINT32_MAX diff -Nur musl-0.9.15/arch/x32/bits/syscall.h musl-git/arch/x32/bits/syscall.h --- musl-0.9.15/arch/x32/bits/syscall.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/syscall.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/syscall.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,634 @@ +#define __X32_SYSCALL_BIT 0x40000000 +#define __NR_read (__X32_SYSCALL_BIT + 0) @@ -4258,7 +4258,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/syscall.h musl-git/arch/x32/bits/syscall.h +#define SYS_fadvise SYS_fadvise64 diff -Nur musl-0.9.15/arch/x32/bits/termios.h musl-git/arch/x32/bits/termios.h --- musl-0.9.15/arch/x32/bits/termios.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,160 @@ +struct termios +{ @@ -4422,7 +4422,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/termios.h musl-git/arch/x32/bits/termios.h +#endif diff -Nur musl-0.9.15/arch/x32/bits/user.h musl-git/arch/x32/bits/user.h --- musl-0.9.15/arch/x32/bits/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/bits/user.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/bits/user.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,44 @@ +#undef __WORDSIZE +#define __WORDSIZE 64 @@ -4470,7 +4470,7 @@ diff -Nur musl-0.9.15/arch/x32/bits/user.h musl-git/arch/x32/bits/user.h +#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) diff -Nur musl-0.9.15/arch/x32/crt_arch.h musl-git/arch/x32/crt_arch.h --- musl-0.9.15/arch/x32/crt_arch.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/crt_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/crt_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,9 @@ +__asm__("\ +.text \n\ @@ -4483,7 +4483,7 @@ diff -Nur musl-0.9.15/arch/x32/crt_arch.h musl-git/arch/x32/crt_arch.h +"); diff -Nur musl-0.9.15/arch/x32/pthread_arch.h musl-git/arch/x32/pthread_arch.h --- musl-0.9.15/arch/x32/pthread_arch.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/pthread_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/pthread_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,10 @@ +static inline struct pthread *__pthread_self() +{ @@ -4497,7 +4497,7 @@ diff -Nur musl-0.9.15/arch/x32/pthread_arch.h musl-git/arch/x32/pthread_arch.h +#define CANCEL_REG_IP 16 diff -Nur musl-0.9.15/arch/x32/reloc.h musl-git/arch/x32/reloc.h --- musl-0.9.15/arch/x32/reloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/reloc.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/reloc.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,46 @@ +#include <stdint.h> +#include <string.h> @@ -4547,7 +4547,7 @@ diff -Nur musl-0.9.15/arch/x32/reloc.h musl-git/arch/x32/reloc.h +} diff -Nur musl-0.9.15/arch/x32/src/syscall_cp_fixup.c musl-git/arch/x32/src/syscall_cp_fixup.c --- musl-0.9.15/arch/x32/src/syscall_cp_fixup.c 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/src/syscall_cp_fixup.c 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/src/syscall_cp_fixup.c 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,31 @@ +#include <sys/syscall.h> +long __syscall_cp_internal(volatile void*, long long, long long, long long, long long, @@ -4580,9 +4580,60 @@ diff -Nur musl-0.9.15/arch/x32/src/syscall_cp_fixup.c musl-git/arch/x32/src/sysc + return __syscall_cp_internal(foo, n, a1, a2, a3, a4, a5, a6); +} + +diff -Nur musl-0.9.15/arch/x32/src/sysinfo.c musl-git/arch/x32/src/sysinfo.c +--- musl-0.9.15/arch/x32/src/sysinfo.c 1970-01-01 01:00:00.000000000 +0100 ++++ musl-git/arch/x32/src/sysinfo.c 2014-03-07 14:03:57.000000000 +0100 +@@ -0,0 +1,47 @@ ++#include <sys/sysinfo.h> ++#include "syscall.h" ++ ++#define klong long long ++#define kulong unsigned long long ++ ++struct kernel_sysinfo { ++ klong uptime; ++ kulong loads[3]; ++ kulong totalram; ++ kulong freeram; ++ kulong sharedram; ++ kulong bufferram; ++ kulong totalswap; ++ kulong freeswap; ++ short procs; ++ short pad; ++ kulong totalhigh; ++ kulong freehigh; ++ unsigned mem_unit; ++}; ++ ++int __x32_sysinfo(struct sysinfo *info) ++{ ++ struct kernel_sysinfo tmp; ++ int ret = syscall(SYS_sysinfo, &tmp); ++ if(ret == -1) return ret; ++ info->uptime = tmp.uptime; ++ info->loads[0] = tmp.loads[0]; ++ info->loads[1] = tmp.loads[1]; ++ info->loads[2] = tmp.loads[2]; ++ kulong shifts; ++ kulong max = tmp.totalram | tmp.totalswap; ++ __asm__("bsr %1,%0" : "=r"(shifts) : "r"(max)); ++ shifts = shifts >= 32 ? shifts - 31 : 0; ++ info->totalram = tmp.totalram >> shifts; ++ info->freeram = tmp.freeram >> shifts; ++ info->sharedram = tmp.sharedram >> shifts; ++ info->bufferram = tmp.bufferram >> shifts; ++ info->totalswap = tmp.totalswap >> shifts; ++ info->freeswap = tmp.freeswap >> shifts; ++ info->procs = tmp.procs ; ++ info->totalhigh = tmp.totalhigh >> shifts; ++ info->freehigh = tmp.freehigh >> shifts; ++ info->mem_unit = (tmp.mem_unit ? tmp.mem_unit : 1) << shifts; ++ return ret; ++} diff -Nur musl-0.9.15/arch/x32/syscall_arch.h musl-git/arch/x32/syscall_arch.h --- musl-0.9.15/arch/x32/syscall_arch.h 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/arch/x32/syscall_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x32/syscall_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,117 @@ +#define __SYSCALL_LL_E(x) (x) +#define __SYSCALL_LL_O(x) (x) @@ -4703,7 +4754,7 @@ diff -Nur musl-0.9.15/arch/x32/syscall_arch.h musl-git/arch/x32/syscall_arch.h +} diff -Nur musl-0.9.15/arch/x86_64/atomic.h musl-git/arch/x86_64/atomic.h --- musl-0.9.15/arch/x86_64/atomic.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/x86_64/atomic.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x86_64/atomic.h 2014-03-07 14:03:57.000000000 +0100 @@ -5,38 +5,36 @@ static inline int a_ctz_64(uint64_t x) @@ -4789,7 +4840,7 @@ diff -Nur musl-0.9.15/arch/x86_64/atomic.h musl-git/arch/x86_64/atomic.h static inline void a_spin() diff -Nur musl-0.9.15/arch/x86_64/bits/shm.h musl-git/arch/x86_64/bits/shm.h --- musl-0.9.15/arch/x86_64/bits/shm.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/x86_64/bits/shm.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x86_64/bits/shm.h 2014-03-07 14:03:57.000000000 +0100 @@ -13,3 +13,14 @@ unsigned long __pad1; unsigned long __pad2; @@ -4807,7 +4858,7 @@ diff -Nur musl-0.9.15/arch/x86_64/bits/shm.h musl-git/arch/x86_64/bits/shm.h + diff -Nur musl-0.9.15/arch/x86_64/bits/stat.h musl-git/arch/x86_64/bits/stat.h --- musl-0.9.15/arch/x86_64/bits/stat.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/x86_64/bits/stat.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x86_64/bits/stat.h 2014-03-07 14:03:57.000000000 +0100 @@ -2,7 +2,7 @@ * by the corresponding correctly-sized userspace types. */ @@ -4819,7 +4870,7 @@ diff -Nur musl-0.9.15/arch/x86_64/bits/stat.h musl-git/arch/x86_64/bits/stat.h diff -Nur musl-0.9.15/arch/x86_64/bits/termios.h musl-git/arch/x86_64/bits/termios.h --- musl-0.9.15/arch/x86_64/bits/termios.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/x86_64/bits/termios.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x86_64/bits/termios.h 2014-03-07 14:03:57.000000000 +0100 @@ -42,6 +42,7 @@ #define IXANY 0004000 #define IXOFF 0010000 @@ -4875,7 +4926,7 @@ diff -Nur musl-0.9.15/arch/x86_64/bits/termios.h musl-git/arch/x86_64/bits/termi +#endif diff -Nur musl-0.9.15/arch/x86_64/pthread_arch.h musl-git/arch/x86_64/pthread_arch.h --- musl-0.9.15/arch/x86_64/pthread_arch.h 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/arch/x86_64/pthread_arch.h 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/arch/x86_64/pthread_arch.h 2014-03-07 14:03:57.000000000 +0100 @@ -1,7 +1,7 @@ static inline struct pthread *__pthread_self() { @@ -4887,7 +4938,7 @@ diff -Nur musl-0.9.15/arch/x86_64/pthread_arch.h musl-git/arch/x86_64/pthread_ar diff -Nur musl-0.9.15/configure musl-git/configure --- musl-0.9.15/configure 2014-01-03 21:12:17.000000000 +0100 -+++ musl-git/configure 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/configure 2014-03-07 14:03:57.000000000 +0100 @@ -222,12 +222,16 @@ # Convert to just ARCH # @@ -4952,9 +5003,29 @@ diff -Nur musl-0.9.15/configure musl-git/configure test "$SUBARCH" \ && printf "configured for %s variant: %s\n" "$ARCH" "$ARCH$SUBARCH" +diff -Nur musl-0.9.15/COPYRIGHT musl-git/COPYRIGHT +--- musl-0.9.15/COPYRIGHT 2014-01-03 21:12:17.000000000 +0100 ++++ musl-git/COPYRIGHT 2014-03-07 14:03:57.000000000 +0100 +@@ -1,6 +1,6 @@ + musl as a whole is licensed under the following standard MIT license: + +-Copyright © 2005-2013 Rich Felker ++Copyright © 2005-2014 Rich Felker + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the +@@ -79,7 +79,7 @@ + from Bionic libc, used on Android. + + All other files which have no copyright comments are original works +-Copyright © 2005-2013 Rich Felker, the main author of this library. ++Copyright © 2005-2014 Rich Felker, the main author of this library. + The decision to exclude such comments is intentional, as it should be + possible to carry around the complete source code on tiny storage + media. All public header files (include/* and arch/*/bits/*) should be diff -Nur musl-0.9.15/crt/superh/crti.s musl-git/crt/superh/crti.s --- musl-0.9.15/crt/superh/crti.s 1970-01-01 01:00:00.000000000 +0100 -+++ musl-git/crt/superh/crti.s 2014-03-01 08:58:14.000000000 +0100 ++++ musl-git/crt/superh/crti.s 2014-03-07 14:03:57.000000000 +0100 @@ -0,0 +1,13 @@ +.section .init +. |