Reapply emscripten patches

Author: kleisauke

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp

@@ -104,6 +104,7 @@ extern struct ps_strings *__ps_strings;
 #endif
 
 #if SANITIZER_EMSCRIPTEN
+// XXX Emscripten this must be defined before including the internal syscall.h header from musl
 #define weak __attribute__(__weak__)
 #define hidden __attribute__((__visibility__("hidden")))
 #include <syscall.h>

system/lib/libc/README.md

@@ -7,8 +7,7 @@ and use a script (`system/lib/update_musl.py`) to pull in updates.
 
 Some changes have been made to the version that was taken from upstream, including:
 
- * Emscripten-specific changes (from before this readme existed). These should be marked with `XXX EMSCRIPTEN` in the source, or ifdefed with `#if __EMSCRIPTEN__`. They are mostly in pthreads code and hopefully temporary.
- * Backporting an operator-precedence warning fix from 6e76e1540fc58a418494bf5eb832b556f9c5763e in the upstream version.
+ * Emscripten-specific changes (from before this readme existed). These should be marked with `XXX EMSCRIPTEN` in the source, or ifdefed with `#ifdef __EMSCRIPTEN__`. They are mostly in pthreads code and hopefully temporary.
  * Switch to using the wasi `fd_write` syscall instead of `writev`.
  * Simplify stdout stream handling: do not support seeking, terminal handling, etc., as it just increases code size and Emscripten doesn't have those features anyhow.
  * Setting `_POSIX_REALTIME_SIGNALS` and `_POSIX_SPAWN` macros to -1, to exclude unsupported functions.

system/lib/libc/musl/src/errno/__errno_location.c

@@ -1,14 +1,14 @@
 #include <errno.h>
 #include "pthread_impl.h"
 
-#if __EMSCRIPTEN_PTHREADS__
+#ifdef __EMSCRIPTEN_PTHREADS__
 // for pthreads, use the proper location on the thread info, so each
 // thread has its own errno
 int *__errno_location(void)
 {
 	return &__pthread_self()->errno_val;
 }
-#else
+#else // !defined(__EMSCRIPTEN_PTHREADS__)
 // for single-threaded mode, avoid linking in pthreads support code
 // just for this
 static int __errno_storage = 0;

system/lib/libc/musl/src/internal/libm.h

@@ -144,6 +144,16 @@ static inline long double fp_barrierl(long double x)
 }
 #endif
 
+#ifdef __EMSCRIPTEN__
+/*
+ * wasm doesn't have user-accessible floating point exceptions, so there's
+ * no point in trying to force expression evaluations to produce them.
+ */
+#define fp_force_evalf(x)
+#define fp_force_eval(x)
+#define fp_force_evall(x)
+#define FORCE_EVAL(x)
+#else
 /* fp_force_eval ensures that the input value is computed when that's
    otherwise unused.  To prevent the constant folding of the input
    expression, an additional fp_barrier may be needed or a compilation
@@ -177,13 +187,6 @@ static inline void fp_force_evall(long double x)
 }
 #endif
 
-#ifdef __EMSCRIPTEN__
-/*
- * asm.js doesn't have user-accessible floating point exceptions, so there's
- * no point in trying to force expression evaluations to produce them.
- */
-#define FORCE_EVAL(x)
-#else
 #define FORCE_EVAL(x) do {                        \
 	if (sizeof(x) == sizeof(float)) {         \
 		fp_force_evalf(x);                \

system/lib/libc/musl/src/internal/pthread_impl.h

@@ -189,7 +189,7 @@ static inline void __wake(volatile void *addr, int cnt, int priv)
 	if (priv) priv = FUTEX_PRIVATE;
 	if (cnt<0) cnt = INT_MAX;
 #ifdef __EMSCRIPTEN__
-	emscripten_futex_wake(addr, (cnt)<0?INT_MAX:(cnt));
+	emscripten_futex_wake(addr, cnt);
 #else
 	__syscall(SYS_futex, addr, FUTEX_WAKE|priv, cnt) != -ENOSYS ||
 	__syscall(SYS_futex, addr, FUTEX_WAKE, cnt);

system/lib/libc/musl/src/internal/syscall.h

@@ -23,7 +23,7 @@
 typedef long syscall_arg_t;
 #endif
 
-#ifdef __cplusplus
+#ifdef __cplusplus // XXX Emscripten we need C linkage for this
 extern "C" {
 #endif
 hidden long __syscall_ret(unsigned long),
@@ -33,14 +33,7 @@ hidden long __syscall_ret(unsigned long),
 }
 #endif
 
-#ifndef __EMSCRIPTEN__
-#define __syscall1(n,a) __syscall1(n,__scc(a))
-#define __syscall2(n,a,b) __syscall2(n,__scc(a),__scc(b))
-#define __syscall3(n,a,b,c) __syscall3(n,__scc(a),__scc(b),__scc(c))
-#define __syscall4(n,a,b,c,d) __syscall4(n,__scc(a),__scc(b),__scc(c),__scc(d))
-#define __syscall5(n,a,b,c,d,e) __syscall5(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
-#define __syscall6(n,a,b,c,d,e,f) __syscall6(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
-#else // __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
 #define __syscall_emscripten(n, ...) n(__VA_ARGS__)
 #define __syscall_emscripten0(n) __syscall_emscripten(n)
 #define __syscall_emscripten1(n,a) __syscall_emscripten(n,__scc(a))
@@ -49,26 +42,35 @@ hidden long __syscall_ret(unsigned long),
 #define __syscall_emscripten4(n,a,b,c,d) __syscall_emscripten(n,__scc(a),__scc(b),__scc(c),__scc(d))
 #define __syscall_emscripten5(n,a,b,c,d,e) __syscall_emscripten(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
 #define __syscall_emscripten6(n,a,b,c,d,e,f) __syscall_emscripten(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
-#endif // __EMSCRIPTEN__
+#else // !defined(__EMSCRIPTEN__)
+#define __syscall1(n,a) __syscall1(n,__scc(a))
+#define __syscall2(n,a,b) __syscall2(n,__scc(a),__scc(b))
+#define __syscall3(n,a,b,c) __syscall3(n,__scc(a),__scc(b),__scc(c))
+#define __syscall4(n,a,b,c,d) __syscall4(n,__scc(a),__scc(b),__scc(c),__scc(d))
+#define __syscall5(n,a,b,c,d,e) __syscall5(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e))
+#define __syscall6(n,a,b,c,d,e,f) __syscall6(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
+#endif // !defined(__EMSCRIPTEN__)
 
 #define __SYSCALL_NARGS_X(a,b,c,d,e,f,g,h,n,...) n
 #define __SYSCALL_NARGS(...) __SYSCALL_NARGS_X(__VA_ARGS__,7,6,5,4,3,2,1,0,)
 #define __SYSCALL_CONCAT_X(a,b) a##b
 #define __SYSCALL_CONCAT(a,b) __SYSCALL_CONCAT_X(a,b)
 #define __SYSCALL_DISP(b,...) __SYSCALL_CONCAT(b,__SYSCALL_NARGS(__VA_ARGS__))(__VA_ARGS__)
 
-#ifndef __EMSCRIPTEN__
-#define __syscall(...) __SYSCALL_DISP(__syscall,__VA_ARGS__)
-#else
+#ifdef __EMSCRIPTEN__
 #define __syscall(...) __SYSCALL_DISP(__syscall_emscripten,__VA_ARGS__)
+#else
+#define __syscall(...) __SYSCALL_DISP(__syscall,__VA_ARGS__)
 #endif
 
 #define syscall(...) __syscall_ret(__syscall(__VA_ARGS__))
 
 #define socketcall(nm,a,b,c,d,e,f) __syscall_ret(__socketcall(nm,a,b,c,d,e,f))
 #define socketcall_cp(nm,a,b,c,d,e,f) __syscall_ret(__socketcall_cp(nm,a,b,c,d,e,f))
 
-#ifndef __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
+#define __syscall_cp(...) __syscall(__VA_ARGS__)
+#else // !defined(__EMSCRIPTEN__)
 #define __syscall_cp0(n) (__syscall_cp)(n,0,0,0,0,0,0)
 #define __syscall_cp1(n,a) (__syscall_cp)(n,__scc(a),0,0,0,0,0)
 #define __syscall_cp2(n,a,b) (__syscall_cp)(n,__scc(a),__scc(b),0,0,0,0)
@@ -78,9 +80,7 @@ hidden long __syscall_ret(unsigned long),
 #define __syscall_cp6(n,a,b,c,d,e,f) (__syscall_cp)(n,__scc(a),__scc(b),__scc(c),__scc(d),__scc(e),__scc(f))
 
 #define __syscall_cp(...) __SYSCALL_DISP(__syscall_cp,__VA_ARGS__)
-#else // __EMSCRIPTEN__
-#define __syscall_cp(...) __syscall(__VA_ARGS__)
-#endif // __EMSCRIPTEN__
+#endif // !defined(__EMSCRIPTEN__)
 
 #define syscall_cp(...) __syscall_ret(__syscall_cp(__VA_ARGS__))
 
@@ -404,7 +404,12 @@ static inline long __alt_socketcall(int sys, int sock, int cp, long a, long b, l
 #define SIOCGSTAMPNS_OLD 0x8907
 #endif
 
-#ifndef __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
+#define __sys_open2(x,pn,fl) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE))
+#define __sys_open3(x,pn,fl,mo) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE), __scc(mo))
+#define __sys_open_cp2(x,pn,fl) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE))
+#define __sys_open_cp3(x,pn,fl,mo) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE), __scc(mo))
+#else // !defined(__EMSCRIPTEN__)
 #ifdef SYS_open
 #define __sys_open2(x,pn,fl) __syscall2(SYS_open, pn, (fl)|O_LARGEFILE)
 #define __sys_open3(x,pn,fl,mo) __syscall3(SYS_open, pn, (fl)|O_LARGEFILE, mo)
@@ -416,20 +421,14 @@ static inline long __alt_socketcall(int sys, int sock, int cp, long a, long b, l
 #define __sys_open_cp2(x,pn,fl) __syscall_cp3(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE)
 #define __sys_open_cp3(x,pn,fl,mo) __syscall_cp4(SYS_openat, AT_FDCWD, pn, (fl)|O_LARGEFILE, mo)
 #endif
-#else // __EMSCRIPTEN__
-#define __sys_open2(x,pn,fl) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE))
-#define __sys_open3(x,pn,fl,mo) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE), __scc(mo))
-#define __sys_open_cp2(x,pn,fl) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE))
-#define __sys_open_cp3(x,pn,fl,mo) __syscall_open(__scc(pn), __scc((fl)|O_LARGEFILE), __scc(mo))
-#endif
-
+#endif // !defined(__EMSCRIPTEN__)
 #define __sys_open(...) __SYSCALL_DISP(__sys_open,,__VA_ARGS__)
 #define sys_open(...) __syscall_ret(__sys_open(__VA_ARGS__))
 
 #define __sys_open_cp(...) __SYSCALL_DISP(__sys_open_cp,,__VA_ARGS__)
 #define sys_open_cp(...) __syscall_ret(__sys_open_cp(__VA_ARGS__))
 
-#ifdef __cplusplus
+#ifdef __cplusplus // XXX Emscripten static array size is a C99 feature, not permitted in C++
 hidden void __procfdname(char __buf[], unsigned);
 #else
 hidden void __procfdname(char __buf[static 15+3*sizeof(int)], unsigned);

system/lib/libc/musl/src/linux/sbrk.c

@@ -1,4 +1,4 @@
-#if !__EMSCRIPTEN__ /* Emscripten controls sbrk itself */
+#ifndef __EMSCRIPTEN__ /* Emscripten controls sbrk itself */
 #define _BSD_SOURCE
 #include <unistd.h>
 #include <stdint.h>
@@ -11,4 +11,3 @@ void *sbrk(intptr_t inc)
 	return (void *)__syscall(SYS_brk, 0);
 }
 #endif
-

system/lib/libc/musl/src/math/sqrt.c

@@ -25,7 +25,7 @@ double sqrt(double x)
 {
 // XXX EMSCRIPTEN: use the wasm instruction via clang builtin
 // See https://github.com/emscripten-core/emscripten/issues/9236
-#ifdef __wasm__
+#ifdef __EMSCRIPTEN__
 	return __builtin_sqrt(x);
 #else
 	uint64_t ix, top, m;

system/lib/libc/musl/src/math/sqrtf.c

@@ -16,7 +16,7 @@ float sqrtf(float x)
 {
 // XXX EMSCRIPTEN: use the wasm instruction via clang builtin
 // See https://github.com/emscripten-core/emscripten/issues/9236
-#ifdef __wasm__
+#ifdef __EMSCRIPTEN__
 	return __builtin_sqrtf(x);
 #else
 	uint32_t ix, m, m1, m0, even, ey;

system/lib/libc/musl/src/sched/sched_yield.c

@@ -1,13 +1,13 @@
 #include <sched.h>
 #include "syscall.h"
 
-#if __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
 #include <emscripten/threading.h>
 #endif
 
 int sched_yield()
 {
-#if __EMSCRIPTEN__
+#ifdef __EMSCRIPTEN__
 	// SharedArrayBuffer and wasm threads do not support explicit yielding.
 	// For now we at least process our event queue so that other threads who
 	// are waiting on this one to perform actions can make progesss.