diff --git a/src/struct_info_generated.json b/src/struct_info_generated.json index 4ab51860ce9a0..c946883c44794 100644 --- a/src/struct_info_generated.json +++ b/src/struct_info_generated.json @@ -1040,11 +1040,11 @@ "p_proto": 8 }, "pthread": { - "__size__": 124, - "profilerBlock": 100, + "__size__": 120, + "profilerBlock": 96, "stack": 48, "stack_size": 52, - "waiting_async": 116 + "waiting_async": 112 }, "pthread_attr_t": { "__size__": 44, diff --git a/system/lib/libc/musl/src/internal/pthread_impl.h b/system/lib/libc/musl/src/internal/pthread_impl.h index 9a9d52d4a16f3..c9a687cddbad8 100644 --- a/system/lib/libc/musl/src/internal/pthread_impl.h +++ b/system/lib/libc/musl/src/internal/pthread_impl.h @@ -69,8 +69,9 @@ struct pthread { #ifndef __EMSCRIPTEN__ // Emscripten uses C11 _Thread_local instead for locale locale_t locale; -#endif + // Emscripten doesn't use this field. volatile int killlock[1]; +#endif char *dlerror_buf; void *stdio_locks; diff --git a/test/codesize/test_codesize_cxx_ctors1.json b/test/codesize/test_codesize_cxx_ctors1.json index 7d5c901f9a048..e2b7e25a38bc5 100644 --- a/test/codesize/test_codesize_cxx_ctors1.json +++ b/test/codesize/test_codesize_cxx_ctors1.json @@ -2,9 +2,9 @@ "a.out.js": 19260, "a.out.js.gz": 7991, "a.out.nodebug.wasm": 132627, - "a.out.nodebug.wasm.gz": 49919, + "a.out.nodebug.wasm.gz": 49918, "total": 151887, - "total_gz": 57910, + "total_gz": 57909, "sent": [ "__cxa_throw", "_abort_js", diff --git a/test/codesize/test_codesize_cxx_except_wasm.json b/test/codesize/test_codesize_cxx_except_wasm.json index a69b1326b2eaf..69dbaf45c33db 100644 --- a/test/codesize/test_codesize_cxx_except_wasm.json +++ b/test/codesize/test_codesize_cxx_except_wasm.json @@ -2,9 +2,9 @@ "a.out.js": 19092, "a.out.js.gz": 7925, "a.out.nodebug.wasm": 147926, - "a.out.nodebug.wasm.gz": 55308, + "a.out.nodebug.wasm.gz": 55309, "total": 167018, - "total_gz": 63233, + "total_gz": 63234, "sent": [ "_abort_js", "_tzset_js", diff --git a/test/codesize/test_codesize_cxx_except_wasm_legacy.json b/test/codesize/test_codesize_cxx_except_wasm_legacy.json index 00312e3edb1e2..b17b5c29c4084 100644 --- a/test/codesize/test_codesize_cxx_except_wasm_legacy.json +++ b/test/codesize/test_codesize_cxx_except_wasm_legacy.json @@ -2,9 +2,9 @@ "a.out.js": 19166, "a.out.js.gz": 7949, "a.out.nodebug.wasm": 145732, - "a.out.nodebug.wasm.gz": 54936, + "a.out.nodebug.wasm.gz": 54935, "total": 164898, - "total_gz": 62885, + "total_gz": 62884, "sent": [ "_abort_js", "_tzset_js", diff --git a/test/codesize/test_codesize_cxx_noexcept.json b/test/codesize/test_codesize_cxx_noexcept.json index 71580e2e47295..53330a6d00294 100644 --- a/test/codesize/test_codesize_cxx_noexcept.json +++ b/test/codesize/test_codesize_cxx_noexcept.json @@ -2,9 +2,9 @@ "a.out.js": 19260, "a.out.js.gz": 7991, "a.out.nodebug.wasm": 134657, - "a.out.nodebug.wasm.gz": 50774, + "a.out.nodebug.wasm.gz": 50773, "total": 153917, - "total_gz": 58765, + "total_gz": 58764, "sent": [ "__cxa_throw", "_abort_js", diff --git a/test/codesize/test_codesize_hello_dylink.json b/test/codesize/test_codesize_hello_dylink.json index efa7401a058dd..5e79b7fae51ba 100644 --- a/test/codesize/test_codesize_hello_dylink.json +++ b/test/codesize/test_codesize_hello_dylink.json @@ -2,9 +2,9 @@ "a.out.js": 26251, "a.out.js.gz": 11195, "a.out.nodebug.wasm": 17671, - "a.out.nodebug.wasm.gz": 8920, + "a.out.nodebug.wasm.gz": 8921, "total": 43922, - "total_gz": 20115, + "total_gz": 20116, "sent": [ "__syscall_stat64", "emscripten_resize_heap", diff --git a/test/codesize/test_codesize_minimal_pthreads.json b/test/codesize/test_codesize_minimal_pthreads.json index 204c9a5c926e0..4eef8447093db 100644 --- a/test/codesize/test_codesize_minimal_pthreads.json +++ b/test/codesize/test_codesize_minimal_pthreads.json @@ -1,8 +1,8 @@ { "a.out.js": 7372, - "a.out.js.gz": 3594, + "a.out.js.gz": 3593, "a.out.nodebug.wasm": 19047, - "a.out.nodebug.wasm.gz": 8795, + "a.out.nodebug.wasm.gz": 8796, "total": 26419, "total_gz": 12389, "sent": [ diff --git a/test/codesize/test_codesize_minimal_pthreads_memgrowth.json b/test/codesize/test_codesize_minimal_pthreads_memgrowth.json index f2a49a3541479..3dfcb4c6c7ff3 100644 --- a/test/codesize/test_codesize_minimal_pthreads_memgrowth.json +++ b/test/codesize/test_codesize_minimal_pthreads_memgrowth.json @@ -2,9 +2,9 @@ "a.out.js": 7781, "a.out.js.gz": 3797, "a.out.nodebug.wasm": 19048, - "a.out.nodebug.wasm.gz": 8796, + "a.out.nodebug.wasm.gz": 8797, "total": 26829, - "total_gz": 12593, + "total_gz": 12594, "sent": [ "a (memory)", "b (exit)",