Update to musl 1.2.0.

See the WHATSNEW file for details. The biggest change in musl is the
switch to 64-bit time_t for 32-bit targets, however WASI libc was already
using 64-bit time_t. The main change affecting WASI is an update to
Unicode 12.1.0.

Author: sunfishcode

expected/wasm32-wasi/predefined-macros.txt

@@ -86,7 +86,7 @@
 #define CDISCARD CTRL('o')
 #define CDSUSP CTRL('y')
 #define CEOF CTRL('d')
-#define CEOL _POSIX_VDISABLE
+#define CEOL '\0'
 #define CEOT CEOF
 #define CERASE 0177
 #define CFLUSH CDISCARD
@@ -124,11 +124,11 @@
 #define CRNCYSTR 0x4000F
 #define CRPRNT CREPRINT
 #define CSTART CTRL('q')
-#define CSTATUS _POSIX_VDISABLE
+#define CSTATUS '\0'
 #define CSTOP CTRL('s')
 #define CSUSP CTRL('z')
 #define CTIME 0
-#define CTRL(x) (x&037)
+#define CTRL(x) ((x)&037)
 #define CWERASE CTRL('w')
 #define C_ANY ns_c_any
 #define C_CHAOS ns_c_chaos
@@ -996,7 +996,7 @@
 #define LFLOW_RESTART_ANY 2
 #define LFLOW_RESTART_XON 3
 #define LITTLE_ENDIAN __LITTLE_ENDIAN
-#define LLONG_MAX (0x7fffffffffffffffLL)
+#define LLONG_MAX 0x7fffffffffffffffLL
 #define LLONG_MIN (-LLONG_MAX-1)
 #define LM_FORWARDMASK 2
 #define LM_MODE 1
@@ -1007,8 +1007,8 @@
 #define LOCK_SH 1
 #define LOCK_UN 8
 #define LONGBITS (sizeof(long) * 8)
-#define LONG_BIT (32)
-#define LONG_MAX (0x7fffffffL)
+#define LONG_BIT 32
+#define LONG_MAX __LONG_MAX
 #define LONG_MIN (-LONG_MAX-1)
 #define L_INCR 1
 #define L_SET 0
@@ -1825,6 +1825,7 @@
 #define TCP_THIN_LINEAR_TIMEOUTS 16
 #define TCP_TIMESTAMP 24
 #define TCP_TIME_WAIT 6
+#define TCP_TX_DELAY 37
 #define TCP_ULP 31
 #define TCP_USER_TIMEOUT 18
 #define TCP_WINDOW_CLAMP 10
@@ -2428,7 +2429,7 @@
 #define __BIGGEST_ALIGNMENT__ 16
 #define __BIG_ENDIAN 4321
 #define __BIND 19950621
-#define __BYTE_ORDER __LITTLE_ENDIAN
+#define __BYTE_ORDER __BYTE_ORDER__
 #define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
 #define __CHAR16_TYPE__ unsigned short
 #define __CHAR32_TYPE__ unsigned int
@@ -2647,6 +2648,7 @@
 #define __LITTLE_ENDIAN 1234
 #define __LITTLE_ENDIAN__ 1
 #define __LONG_LONG_MAX__ 9223372036854775807LL
+#define __LONG_MAX __LONG_MAX__
 #define __LONG_MAX__ 2147483647L
 #define __NAMESER 19991006
 #define __NEED_FILE 
@@ -2735,6 +2737,7 @@
 #define __PTRDIFF_MAX__ 2147483647L
 #define __PTRDIFF_TYPE__ long int
 #define __PTRDIFF_WIDTH__ 32
+#define __REDIR(x,y) __typeof__(x) x __asm__(#y)
 #define __RETCAST(x) 
 #define __RETCAST_2(x,y) 
 #define __RETCAST_3(x,y,z) 
@@ -2782,6 +2785,7 @@
 #define __UAPI_DEF_IN_IPPROTO 0
 #define __UAPI_DEF_IN_PKTINFO 0
 #define __UAPI_DEF_IP6_MTUINFO 0
+#define __UAPI_DEF_IPHDR 0
 #define __UAPI_DEF_IPPROTO_V6 0
 #define __UAPI_DEF_IPV6_MREQ 0
 #define __UAPI_DEF_IPV6_OPTIONS 0
@@ -2880,6 +2884,7 @@
 #define __UINT_LEAST8_MAX__ 255
 #define __UINT_LEAST8_TYPE__ unsigned char
 #define __USER_LABEL_PREFIX__ 
+#define __USE_TIME_BITS64 1
 #define __WASI_ADVICE_DONTNEED (UINT8_C(4))
 #define __WASI_ADVICE_NOREUSE (UINT8_C(5))
 #define __WASI_ADVICE_NORMAL (UINT8_C(0))
@@ -3168,6 +3173,7 @@
 #define acosh(x) __tg_real_complex(acosh, (x))
 #define alignas _Alignas
 #define alignof _Alignof
+#define alloca __builtin_alloca
 #define alphasort64 alphasort
 #define and &&
 #define and_eq &=

libc-top-half/musl/.mailmap

@@ -0,0 +1 @@
+Ada Worcester <oss@ada.pikhq.com> <josiahw@gmail.com>

libc-top-half/musl/COPYRIGHT

@@ -1,7 +1,7 @@
 musl as a whole is licensed under the following standard MIT license:
 
 ----------------------------------------------------------------------
-Copyright © 2005-2019 Rich Felker, et al.
+Copyright © 2005-2020 Rich Felker, et al.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -26,6 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 Authors/contributors include:
 
 A. Wilcox
+Ada Worcester
 Alex Dowad
 Alex Suykov
 Alexander Monakov
@@ -65,7 +66,6 @@ Jeremy Huntwork
 Jo-Philipp Wich
 Joakim Sindholt
 John Spencer
-Josiah Worcester
 Julien Ramseier
 Justin Cormack
 Kaarle Ritvanen

libc-top-half/musl/Makefile

@@ -17,7 +17,7 @@ includedir = $(prefix)/include
 libdir = $(prefix)/lib
 syslibdir = /lib
 
-SRC_DIRS = $(addprefix $(srcdir)/,src/* crt ldso)
+SRC_DIRS = $(addprefix $(srcdir)/,src/* crt ldso $(COMPAT_SRC_DIRS))
 BASE_GLOBS = $(addsuffix /*.c,$(SRC_DIRS))
 ARCH_GLOBS = $(addsuffix /$(ARCH)/*.[csS],$(SRC_DIRS))
 BASE_SRCS = $(sort $(wildcard $(BASE_GLOBS)))
@@ -27,7 +27,7 @@ ARCH_OBJS = $(patsubst $(srcdir)/%,%.o,$(basename $(ARCH_SRCS)))
 REPLACED_OBJS = $(sort $(subst /$(ARCH)/,/,$(ARCH_OBJS)))
 ALL_OBJS = $(addprefix obj/, $(filter-out $(REPLACED_OBJS), $(sort $(BASE_OBJS) $(ARCH_OBJS))))
 
-LIBC_OBJS = $(filter obj/src/%,$(ALL_OBJS))
+LIBC_OBJS = $(filter obj/src/%,$(ALL_OBJS)) $(filter obj/compat/%,$(ALL_OBJS))
 LDSO_OBJS = $(filter obj/ldso/%,$(ALL_OBJS:%.o=%.lo))
 CRT_OBJS = $(filter obj/crt/%,$(ALL_OBJS))
 
@@ -75,6 +75,7 @@ WRAPCC_CLANG = clang
 LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1
 
 -include config.mak
+-include $(srcdir)/arch/$(ARCH)/arch.mak
 
 ifeq ($(ARCH),)
 

libc-top-half/musl/VERSION

@@ -1 +1 @@
-1.1.24
+1.2.0

libc-top-half/musl/WHATSNEW

@@ -2164,3 +2164,39 @@ arch-specific bugs fixed:
 - riscv64 atomics had broken asm constraints (missing earlyclobber flag)
 - arm clone() was broken when compiled as thumb if start function returned
 - mipsr6 setjmp/longjmp did not preserve fpu register state correctly
+
+
+
+1.2.0 release notes
+
+new features:
+- time_t is now 64-bit on all archs (not just 64-bit archs)
+- character type & case mapping data updated to Unicode 12.1.0
+- header-level support for new linux features in 5.3 and 5.4
+
+performance:
+- new O(1) wchar_t case mapping implementation
+- i386 now uses C math code for exp, faster than old asm
+- mips math asm
+
+compatibility & conformance:
+- endian.h now aims to conform to future POSIX definition
+- support older compilers that don't accept powerpc math asm constraints
+- fdpic code in ldso was incompatible with valid optimizations in gcc 9+
+- RLIMIT_RTTIME was missing from sys/resource.h
+
+bugs fixed:
+- wcwidth wrongly returned 0 for most of planes 4 and up
+- missing case mapping between U+03F3 and U+037F
+- wrong cacosh results for arguments with negative imaginary part
+- wrong catanf/catanl results for various classes of arguments
+- wrong return value for ungetc with argument outside [0,UCHAR_MAX]
+- posix_openpt with no ptys available produced wrong errno
+
+arch-specific bugs fixed:
+- sigcontext/regset definition mistakes & omissions on m68k, powerpc64
+- fesetenv(FE_DFL_ENV) crashed on riscv64
+- sh2 dynamic linker was broken since 1.1.21 (crash in stage 2b)
+- arm dynamic linker chose wrong tls/atomic variants since 1.1.21
+- some math library functions returned excess precision on i386
+- unconfirmed regression in fchmodat AT_SYMLINK_NOFOLLOW on mips*

libc-top-half/musl/arch/aarch64/bits/alltypes.h.in

@@ -2,8 +2,13 @@
 #define _Int64 long
 #define _Reg long
 
-TYPEDEF __builtin_va_list va_list;
-TYPEDEF __builtin_va_list __isoc_va_list;
+#if __AARCH64EB__
+#define __BYTE_ORDER 4321
+#else
+#define __BYTE_ORDER 1234
+#endif
+
+#define __LONG_MAX 0x7fffffffffffffffL
 
 #ifndef __cplusplus
 TYPEDEF unsigned wchar_t;
@@ -17,14 +22,3 @@ TYPEDEF float float_t;
 TYPEDEF double double_t;
 
 TYPEDEF struct { long long __ll; long double __ld; } max_align_t;
-
-TYPEDEF long time_t;
-TYPEDEF long suseconds_t;
-
-TYPEDEF struct { union { int __i[14]; volatile int __vi[14]; unsigned long __s[7]; } __u; } pthread_attr_t;
-TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; volatile void *volatile __p[5]; } __u; } mtx_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } pthread_cond_t;
-TYPEDEF struct { union { int __i[12]; volatile int __vi[12]; void *__p[6]; } __u; } cnd_t;
-TYPEDEF struct { union { int __i[14]; volatile int __vi[14]; void *__p[7]; } __u; } pthread_rwlock_t;
-TYPEDEF struct { union { int __i[8]; volatile int __vi[8]; void *__p[4]; } __u; } pthread_barrier_t;