Revert unnecessary changes

Author: kleisauke

system/lib/libc/musl/src/thread/__timedwait.c

@@ -32,20 +32,18 @@ static int __futex4_cp(volatile void *addr, int op, int val, const struct timesp
 	if (r != -ENOSYS) return r;
 	return __syscall_cp(SYS_futex, addr, op & ~FUTEX_PRIVATE, val, to);
 }
+#endif
 
 static volatile int dummy = 0;
 weak_alias(dummy, __eintr_valid_flag);
-#endif
 
 int __timedwait_cp(volatile int *addr, int val,
 	clockid_t clk, const struct timespec *at, int priv)
 {
 	int r;
 	struct timespec to, *top=0;
 
-#ifndef __EMSCRIPTEN__
 	if (priv) priv = FUTEX_PRIVATE;
-#endif
 
 	if (at) {
 		if (at->tv_nsec >= 1000000000UL) return EINVAL;
@@ -58,9 +56,10 @@ int __timedwait_cp(volatile int *addr, int val,
 		if (to.tv_sec < 0) return ETIMEDOUT;
 		top = &to;
 	}
+
 #ifdef __EMSCRIPTEN__
 	pthread_t self = __pthread_self();
-	double msecsToSleep = top ? (top->tv_sec * 1000.0 + top->tv_nsec / 1000000.0) : INFINITY;
+	double msecsToSleep = top ? (top->tv_sec * 1000 + top->tv_nsec / 1000000.0) : INFINITY;
 	const int is_runtime_thread = emscripten_is_main_runtime_thread();
 
 	// Main runtime thread may need to run proxied calls, so sleep in very small slices to be responsive.
@@ -94,13 +93,11 @@ int __timedwait_cp(volatile int *addr, int val,
 	r = -__futex4_cp(addr, FUTEX_WAIT|priv, val, top);
 #endif
 	if (r != EINTR && r != ETIMEDOUT && r != ECANCELED) r = 0;
-#ifndef __EMSCRIPTEN__ // XXX Emscripten revert musl commit a63c0104e496f7ba78b64be3cd299b41e8cd427f
 	/* Mitigate bug in old kernels wrongly reporting EINTR for non-
 	 * interrupting (SA_RESTART) signal handlers. This is only practical
 	 * when NO interrupting signal handlers have been installed, and
 	 * works by sigaction tracking whether that's the case. */
 	if (r == EINTR && !__eintr_valid_flag) r = 0;
-#endif
 
 	return r;
 }

system/lib/libc/musl/src/thread/__wait.c

@@ -8,9 +8,7 @@
 void __wait(volatile int *addr, volatile int *waiters, int val, int priv)
 {
 	int spins=100;
-#ifndef __EMSCRIPTEN__
 	if (priv) priv = FUTEX_PRIVATE;
-#endif
 	while (spins-- && (!waiters || !*waiters)) {
 		if (*addr==val) a_spin();
 		else return;