feedback

Author: sbc100

ChangeLog.md

@@ -22,7 +22,7 @@ See docs/process.md for more on how version tagging works.
 ------
 - The version of musl libc used by emscripten was upgraded from v1.1.15 to
   v1.2.2.  There could be some minor size regressions (or gains) due to changes
-  in upstream musl code be we don't expect anything major.  Since this fairly
+  in upstream musl code but we don't expect anything major.  Since this fairly
   change (at least internally) we are bumping the major version of emscripten
   to 3. (#13006)
 

system/lib/libc/musl/include/threads.h

@@ -20,11 +20,6 @@ typedef void (*tss_dtor_t)(void *);
 #define __NEED_cnd_t
 #define __NEED_mtx_t
 
-// XXX Emscripten: Fix musl libc issue, where the above defines are wrong, but instead should be the following: (https://github.com/emscripten-core/emscripten/issues/5343)
-#define __NEED_pthread_cond_t
-#define __NEED_pthread_mutex_t
-// XXX
-
 #include <bits/alltypes.h>
 
 #define TSS_DTOR_ITERATIONS 4

system/lib/libc/musl/src/locale/newlocale.c

@@ -54,9 +54,6 @@ static locale_t do_newlocale(int mask, const char *name, locale_t loc)
 		return &default_ctype_locale;
 
 	/* If no builtin locale matched, attempt to allocate and copy. */
-	/* XXX EMSCRIPTEN .. */
-	/*if ((loc = malloc(sizeof *loc))) *loc = tmp;*/
-
 	if ((loc = malloc(sizeof *loc))) *loc = tmp;
 
 	return loc;

system/lib/libc/musl/src/stat/fstatat.c

@@ -8,8 +8,10 @@
 #include "syscall.h"
 #include "kstat.h"
 
-/* XXX Emscripten: we ensure kstat == stat so we can simply make the syscall
- * without the extra copy */
+/* XXX Emscripten: We #define kstat to stat so we can simply make the syscall
+ * without the extra copy.
+ * See arch/emscripten/kstat.h
+ */
 #ifndef __EMSCRIPTEN__
 struct statx {
 	uint32_t stx_mask;
@@ -139,6 +141,7 @@ int fstatat(int fd, const char *restrict path, struct stat *restrict st, int fla
 {
 	int ret;
 #ifdef __EMSCRIPTEN__
+	// some logic here copied from fstatat_kstat above
 	if (flag==AT_EMPTY_PATH && fd>=0 && !*path)
 		ret = __syscall(SYS_fstat, fd, st);
 	else if ((fd == AT_FDCWD || *path=='/') && !flag)

system/lib/pthread/library_pthread.c

@@ -832,7 +832,6 @@ weak_alias(dummy_tsd, __pthread_tsd_main);
 __attribute__((constructor(48)))
 void __emscripten_init_main_thread(void) {
   __emscripten_init_main_thread_js(&__main_pthread);
-  //printf("__emscripten_init_main_thread %p\n", __main_pthread);
 
   // The pthread struct has a field that points to itself - this is used as
   // a magic ID to detect whether the pthread_t structure is 'alive'.

tests/test_other.py

@@ -1667,8 +1667,8 @@ def test_dylink_pthread_static_data(self):
       emcc_args=[
         '-pthread', '-Wno-experimental',
         '-s', 'PROXY_TO_PTHREAD',
-        '-s', 'EXIT_RUNTIME',
-        '-s', 'MAIN_MODULE=2',
+        '-s', 'EXIT_RUNTIME=1',
+        '-s', 'MAIN_MODULE=1',
         'side.wasm',
       ])