Update musl to 1.1.15 (#4813)

* Revert all emscripten musl changes

* Update musl to 1.1.5

* Reapply emscripten patches

* Fix up libs to partially compile

* Revert emscripten musl include folder

* Update musl include folder to 1.1.5

* Reapply emscripten libc include changes

* Get compiling again!

* Restore alltypes.h to have emscripten-specific changes

alltypes.h is autogenerated, and we've since overridden the types

Longer-term, we should figure out a way to either autogenerate the types
to match what emscripten expects, or change emscripten's expectation to
support musl's assumptions. Probably worth including with merging the
asm&wasm ABIs.

* Update expected langinfo test output for fixes in upstream musl

* Canonicalize nans in hyperbolic test

Nans are now printed out with their sign if negative. Asm and wasm treat
these differently, so canonicalize how they print.

* Tweak how musl forwards syscalls to emscripten

Before: pass all syscall args as varargs, args are int32
After: cast all syscall args to int32, pass as varargs
This fixes and prevents aliasing issues, and is more consistent with
other architectures

* Change __syscall to syscall in isatty to set errno

POSIX specifies that isatty sets errno in the case that it fails.
__syscall doesn't set errno, and syscall does.

* Update struct_info again

* Always allocate pthread_self, even in the stub

* sys_open should call __syscall_ret

* Fix up pthread js for optimized code (remove __asm: true)

* Canonicalize more nans in testsuite

* Re-set expected langinfo output

* Update align_moar expected addresses

* Disable assert in wasm_backend llseek syscall

* Update now-passing wasm_backend tests

* Update other.test_locale to non-stub setlocale

* Fix compiling with -s USE_PTHREADS=1

* Initialize __pthread_self() when using pthread_stub

* Canonicalize nans for test_zerodiv

* Update count of globals in test_dlfcn_self

* Rework how we initialize pthread_self for non-threaded applications

* Prefer 'EMSCRIPTEN_START_FUNCS' in test_memorygrowth, because 'var TOTAL_MEMORY' can move around

* Now that CURRENT_LOCALE isn't reading off NULL, test_langinfo should expect ASCII

* Re-disable test_demangle_stacks - was spuriously passing earlier

* Explicitly pass 0 as the high bits for SYS__llseek

* Enable v8 for test_readdir now that it supports printErr

* Only use __syscall_emscripten if __EMSCRIPTEN__ is defined

* Move O_LARGEFILE as default back to libc

* libc #if to #ifdef

* Rename pthread import funcs to not rely on alias

* Consistently reference pthread_setcancelstate by alias in libc

* Stub out fcntl64 for NO_FILESYSTEM case

* Update emscripten-specific pthread struct fields

* Consistently reference pthread_testcancel by alias in libc

* Stub out SYS_rt_sigqueueinfo syscall

* Stub out SYS_sendmmsg syscall

* Stub out SYS_recvmmsg syscall

* Revert "Consistently reference pthread_testcancel by alias in libc"

This reverts commit 43563a5.

* Revert "Consistently reference pthread_setcancelstate by alias in libc"

This reverts commit 2ca2ede.

* Correctly fix unresolved symbol: __pthread_setcancelstate

* Update library_pthread.c pthread_testcancel to match musl's expectations

* test_strftime.c -> test_strftime.cpp

* library_pthread_stub pthread_exit should call exit, not nothing

* TEMP: init pthread_self->locale with pthreads enabled

* Initialize pthread global data from libc in JS

* Move _b_lock and _b_waiters back to not emscripten-only

* Remove untrue __asm annotation from threaded pthread_self, make stub pthread_self non-asm

* Remove old unneeded pthread init exported functions

* Move pthread_self in stub case to libc C code

* Move emscripten_pthread initialization to its own file, out from locale_map.c

* Statically allocate the pthread struct and not just a pointer in the stub case

* Remove commented-out test args

* Remove misleading __asm annotation for _register_pthread_ptr

* Do module-side pthread initialization in-module

* Don't cast away volatile when calling emscripten_futex_wake in __wake

* Expose libc struct to emscripten, use that for non-main pthread initialization

* Re-add pthread_impl.h import to library_pthread.c

* Update align_moar alignment post-rebase

* Update emscripten header include in libc.c

* Remove obsolete locale preallocating code in newlocale

We previously statically allocated a single locale in the event that
we needed to dynamically allocate one during startup. musl changed their
implementation to statically allocate C_LOCALE and UTF8_LOCALE, so we
already get that behavior.
In addition this was causing invalid locales to get allocated instead of
returning NULL, because the preceding logic changed. That was caught by
other.test_locale_wrong

* Update test_llvm_lto

* Bump version to 1.37.5

Author: jgravelle-google

emscripten-version.txt

@@ -1 +1 @@
-"1.37.4"
+"1.37.5"

src/library.js

@@ -2107,6 +2107,12 @@ LibraryManager.library = {
     return -1;
   },
 
+  __map_file__deps: ['$ERRNO_CODES', '__setErrNo'],
+  __map_file: function(pathname, size) {
+    ___setErrNo(ERRNO_CODES.EPERM);
+    return -1;
+  },
+
   _MONTH_DAYS_REGULAR: [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
   _MONTH_DAYS_LEAP: [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31],
 
@@ -4282,7 +4288,7 @@ LibraryManager.library = {
   _pthread_cleanup_push: function(){},
   _pthread_cleanup_pop: function(){},
   __pthread_self: function() { abort() },
-  pthread_setcancelstate: function() { return 0 },
+  __pthread_setcancelstate: function() { return 0 },
 
   // libunwind
 

src/library_pthread.js

@@ -416,6 +416,10 @@ var LibraryPThread = {
     Atomics.store(HEAPU32, (pthread.threadInfoStruct + {{{ C_STRUCTS.pthread.attr }}} + 20) >> 2, threadParams.schedPolicy);
     Atomics.store(HEAPU32, (pthread.threadInfoStruct + {{{ C_STRUCTS.pthread.attr }}} + 24) >> 2, threadParams.schedPrio);
 
+    var global_libc = _emscripten_get_global_libc();
+    var global_locale = global_libc + {{{ C_STRUCTS.libc.global_locale }}};
+    Atomics.store(HEAPU32, (pthread.threadInfoStruct + {{{ C_STRUCTS.pthread.locale }}}) >> 2, global_locale);
+
 #if PTHREADS_PROFILING
     PThread.createProfilerBlock(pthread.threadInfoStruct);
 #endif
@@ -735,7 +739,6 @@ var LibraryPThread = {
   _pthread_is_main_runtime_thread: 0,
   _pthread_is_main_browser_thread: 0,
 
-  _register_pthread_ptr__asm: true,
   _register_pthread_ptr__deps: ['_pthread_ptr', '_pthread_is_main_runtime_thread', '_pthread_is_main_browser_thread'],
   _register_pthread_ptr: function(pthreadPtr, isMainBrowserThread, isMainRuntimeThread) {
     pthreadPtr = pthreadPtr|0;
@@ -747,7 +750,6 @@ var LibraryPThread = {
   },
 
   // Public pthread_self() function which returns a unique ID for the thread.
-  pthread_self__asm: true,
   pthread_self__deps: ['_pthread_ptr'],
   pthread_self: function() {
     return __pthread_ptr|0;

src/library_pthread_stub.js

@@ -79,12 +79,6 @@ var LibraryPThreadStub = {
     return 0;
   },
 
-  pthread_self__asm: true,
-  pthread_self__sig: 'i',
-  pthread_self: function() {
-    return 0;
-  },
-
   pthread_attr_init: function(attr) {
     /* int pthread_attr_init(pthread_attr_t *attr); */
     //FIXME: should allocate a pthread_attr_t
@@ -194,7 +188,10 @@ var LibraryPThreadStub = {
     return {{{ cDefine('EAGAIN') }}};
   },
   pthread_cancel: function() {},
-  pthread_exit: function() {},
+  pthread_exit__deps: ['exit'],
+  pthread_exit: function(status) {
+    _exit(status);
+  },
 
   pthread_equal: function() {},
   pthread_join: function() {},

src/library_syscall.js

@@ -332,6 +332,12 @@ var SyscallsLibrary = {
         var argp = SYSCALLS.get();
         return FS.ioctl(stream, op, argp);
       }
+      case {{{ cDefine('TIOCGWINSZ') }}}: {
+        // TODO: in theory we should write to the winsize struct that gets
+        // passed in, but for now musl doesn't read anything on it
+        if (!stream.tty) return -ERRNO_CODES.ENOTTY;
+        return 0;
+      }
       default: abort('bad ioctl syscall ' + op);
     }
 #endif // NO_FILESYSTEM
@@ -833,6 +839,12 @@ var SyscallsLibrary = {
     }
     return nonzero;
   },
+  __syscall178: function(which, varargs) { // rt_sigqueueinfo
+#if SYSCALL_DEBUG
+    Module.printErr('warning: ignoring SYS_rt_sigqueueinfo');
+#endif
+    return 0;
+  },
   __syscall180: function(which, varargs) { // pread64
     var stream = SYSCALLS.getStreamFromFD(), buf = SYSCALLS.get(), count = SYSCALLS.get(), zero = SYSCALLS.getZero(), offset = SYSCALLS.get64();
     return FS.read(stream, {{{ heapAndOffset('HEAP8', 'buf') }}}, count, offset);
@@ -996,6 +1008,12 @@ var SyscallsLibrary = {
   },
   __syscall221__deps: ['__setErrNo'],
   __syscall221: function(which, varargs) { // fcntl64
+#if NO_FILESYSTEM
+#if SYSCALL_DEBUG
+    Module.printErr('no-op in fcntl64 syscall due to NO_FILESYSTEM');
+#endif
+    return 0;
+#else
     var stream = SYSCALLS.getStreamFromFD(), cmd = SYSCALLS.get();
     switch (cmd) {
       case {{{ cDefine('F_DUPFD') }}}: {
@@ -1044,6 +1062,7 @@ var SyscallsLibrary = {
         return -ERRNO_CODES.EINVAL;
       }
     }
+#endif // NO_FILESYSTEM
   },
   __syscall265: function(which, varargs) { // clock_nanosleep
 #if SYSCALL_DEBUG
@@ -1231,6 +1250,12 @@ var SyscallsLibrary = {
     var stream = SYSCALLS.getStreamFromFD(), iov = SYSCALLS.get(), iovcnt = SYSCALLS.get(), offset = SYSCALLS.get();
     return SYSCALLS.doWritev(stream, iov, iovcnt, offset);
   },
+  __syscall337: function(which, varargs) { // recvmmsg
+#if SYSCALL_DEBUG
+    Module.printErr('warning: ignoring SYS_recvmmsg');
+#endif
+    return 0;
+  },
   __syscall340: function(which, varargs) { // prlimit64
     var pid = SYSCALLS.get(), resource = SYSCALLS.get(), new_limit = SYSCALLS.get(), old_limit = SYSCALLS.get();
     if (old_limit) { // just report no limits
@@ -1241,6 +1266,12 @@ var SyscallsLibrary = {
     }
     return 0;
   },
+  __syscall345: function(which, varargs) { // sendmmsg
+#if SYSCALL_DEBUG
+    Module.printErr('warning: ignoring SYS_sendmmsg');
+#endif
+    return 0;
+  },
 };
 
 if (SYSCALL_DEBUG) {
@@ -1577,6 +1608,7 @@ if (SYSCALL_DEBUG) {
     SYS_inotify_init1: 332,
     SYS_preadv: 333,
     SYS_pwritev: 334,
+    SYS_recvmmsg: 337,
     SYS_prlimit64: 340,
     SYS_name_to_handle_at: 341,
     SYS_open_by_handle_at: 342,

src/struct_info.compiled.json

@@ -467,7 +467,8 @@
             "F_GETOWN_EX",
             "F_SETFD", 
             "O_EXCL", 
-            "F_GETFL"
+            "F_GETFL",
+            "O_LARGEFILE"
         ],
         "structs": {}
     }, 
@@ -491,7 +492,8 @@
             "TCGETS",
             "TCSETS",
             "TIOCGPGRP",
-            "TIOCSPGRP"
+            "TIOCSPGRP",
+            "TIOCGWINSZ"
         ],
         "structs": {}
     }, 
@@ -1485,7 +1487,17 @@
               "tid",
               "pid",
               "canceldisable",
-              "cancelasync"
+              "cancelasync",
+              "locale"
+            ]
+        },
+        "defines": []
+    },
+    {
+        "file": "../lib/libc/musl/src/internal/libc.h",
+        "structs": {
+            "libc": [
+              "global_locale"
             ]
         },
         "defines": []

src/struct_info.json

@@ -80,9 +80,9 @@ uint16_t emscripten_atomic_xor_u16(void/*uint16_t*/ *addr, uint16_t val);
 uint32_t emscripten_atomic_xor_u32(void/*uint32_t*/ *addr, uint32_t val);
 uint64_t emscripten_atomic_xor_u64(void/*uint64_t*/ *addr, uint64_t val); // Emulated with locks, very slow!!
 
-int emscripten_futex_wait(void/*uint32_t*/ *addr, uint32_t val, double maxWaitMilliseconds);
-int emscripten_futex_wake(void/*uint32_t*/ *addr, int count);
-int emscripten_futex_wake_or_requeue(void/*uint32_t*/ *addr, int count, void/*uint32_t*/ *addr2, int cmpValue);
+int emscripten_futex_wait(volatile void/*uint32_t*/ *addr, uint32_t val, double maxWaitMilliseconds);
+int emscripten_futex_wake(volatile void/*uint32_t*/ *addr, int count);
+int emscripten_futex_wake_or_requeue(volatile void/*uint32_t*/ *addr, int count, volatile void/*uint32_t*/ *addr2, int cmpValue);
 
 typedef union em_variant_val
 {

system/include/emscripten/threading.h

@@ -21,7 +21,7 @@ struct aiocb {
 	struct sigevent aio_sigevent;
 	void *__td;
 	int __lock[2];
-	int __err;
+	volatile int __err;
 	ssize_t __ret;
 	off_t aio_offset;
 	void *__next, *__prev;

system/include/libc/aio.h

@@ -28,6 +28,7 @@ TYPEDEF _Int64 blkcnt_t;
 TYPEDEF unsigned _Int64 fsblkcnt_t;
 TYPEDEF unsigned _Int64 fsfilcnt_t;
 
+TYPEDEF unsigned wint_t;
 TYPEDEF unsigned long wctype_t;
 
 TYPEDEF void * timer_t;
@@ -58,6 +59,8 @@ TYPEDEF struct { unsigned __attr[2]; } pthread_rwlockattr_t;
 
 TYPEDEF struct _IO_FILE FILE;
 
+TYPEDEF struct __mbstate_t { unsigned __opaque1, __opaque2; } mbstate_t;
+
 TYPEDEF struct __locale_struct * locale_t;
 
 TYPEDEF struct __sigset_t { unsigned long __bits[128/sizeof(long)]; } sigset_t;

system/include/libc/alltypes.h.in

@@ -1,6 +1,11 @@
 #ifndef _ARPA_NAMESER_H
 #define _ARPA_NAMESER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stddef.h>
 #include <stdint.h>
 
 #define __NAMESER	19991006
@@ -48,6 +53,8 @@ extern const struct _ns_flagdata _ns_flagdata[];
 #define ns_msg_end(handle) ((handle)._eom + 0)
 #define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
 #define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
+#define ns_msg_getflag(handle, flag) \
+	(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift)
 
 typedef	struct __ns_rr {
 	char		name[NS_MAXDNAME];
@@ -296,43 +303,20 @@ typedef enum __ns_cert_types {
 #define NS_OPT_DNSSEC_OK        0x8000U
 #define NS_OPT_NSID		3
 
-#define NS_GET16(s, cp) do { \
-	register const unsigned char *t_cp = (const unsigned char *)(cp); \
-	(s) = ((uint16_t)t_cp[0] << 8) \
-	    | ((uint16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-} while (0)
-
-#define NS_GET32(l, cp) do { \
-	register const unsigned char *t_cp = (const unsigned char *)(cp); \
-	(l) = ((uint32_t)t_cp[0] << 24) \
-	    | ((uint32_t)t_cp[1] << 16) \
-	    | ((uint32_t)t_cp[2] << 8) \
-	    | ((uint32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-} while (0)
-
-#define NS_PUT16(s, cp) do { \
-	register uint16_t t_s = (uint16_t)(s); \
-	register unsigned char *t_cp = (unsigned char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-} while (0)
-
-#define NS_PUT32(l, cp) do { \
-	register uint32_t t_l = (uint32_t)(l); \
-	register unsigned char *t_cp = (unsigned char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-} while (0)
+#define NS_GET16(s, cp) (void)((s) = ns_get16(((cp)+=2)-2))
+#define NS_GET32(l, cp) (void)((l) = ns_get32(((cp)+=4)-4))
+#define NS_PUT16(s, cp) ns_put16((s), ((cp)+=2)-2)
+#define NS_PUT32(l, cp) ns_put32((l), ((cp)+=4)-4)
 
+unsigned ns_get16(const unsigned char *);
+unsigned long ns_get32(const unsigned char *);
+void ns_put16(unsigned, unsigned char *);
+void ns_put32(unsigned long, unsigned char *);
 
+int ns_initparse(const unsigned char *, int, ns_msg *);
+int ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
+int ns_skiprr(const unsigned char *, const unsigned char *, ns_sect, int);
+int ns_name_uncompress(const unsigned char *, const unsigned char *, const unsigned char *, char *, size_t);
 
 
 #define	__BIND		19950621
@@ -464,4 +448,8 @@ typedef struct {
 #define	PUTSHORT		NS_PUT16
 #define	PUTLONG			NS_PUT32
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

system/include/libc/arpa/nameser.h

@@ -8,11 +8,15 @@
 #define assert(x) ((void)((x) || (__assert_fail(#x, __FILE__, __LINE__, __func__),0)))
 #endif
 
+#if __STDC_VERSION__ >= 201112L && !defined(__cplusplus)
+#define static_assert _Static_assert
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#if __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
 _Noreturn
 #endif
 void __assert_fail (const char *, const char *, int, const char *);

system/include/libc/assert.h

@@ -7,9 +7,9 @@ extern "C" {
 
 #define complex _Complex
 #ifdef __GNUC__
-#define _Complex_I (__extension__ 1.0fi)
+#define _Complex_I (__extension__ (0.0f+1.0fi))
 #else
-#define _Complex_I 1.0fi
+#define _Complex_I (0.0f+1.0fi)
 #endif
 #define I _Complex_I
 
@@ -101,8 +101,9 @@ double creal(double complex);
 float crealf(float complex);
 long double creall(long double complex);
 
+#ifndef __cplusplus
 #define __CIMAG(x, t) \
-	((union { _Complex t __z; t __xy[2]; }){(_Complex t)(x)}.__xy[1])
+	(+(union { _Complex t __z; t __xy[2]; }){(_Complex t)(x)}.__xy[1])
 
 #define creal(x) ((double)(x))
 #define crealf(x) ((float)(x))
@@ -111,13 +112,20 @@ long double creall(long double complex);
 #define cimag(x) __CIMAG(x, double)
 #define cimagf(x) __CIMAG(x, float)
 #define cimagl(x) __CIMAG(x, long double)
+#endif
 
-#define __CMPLX(x, y, t) \
-	((union { _Complex t __z; t __xy[2]; }){.__xy = {(x),(y)}}.__z)
-
+#if __STDC_VERSION__ >= 201112L
+#if defined(_Imaginary_I)
+#define __CMPLX(x, y, t) ((t)(x) + _Imaginary_I*(t)(y))
+#elif defined(__clang__)
+#define __CMPLX(x, y, t) (+(_Complex t){ (t)(x), (t)(y) })
+#else
+#define __CMPLX(x, y, t) (__builtin_complex((t)(x), (t)(y)))
+#endif
 #define CMPLX(x, y) __CMPLX(x, y, double)
 #define CMPLXF(x, y) __CMPLX(x, y, float)
 #define CMPLXL(x, y) __CMPLX(x, y, long double)
+#endif
 
 #ifdef __cplusplus
 }