Prefer mutex typedefs provided by musl (#24842)

Followup to #24773.

Author: kleisauke

system/lib/libc/musl/arch/emscripten/bits/alltypes.h

@@ -93,18 +93,6 @@ typedef struct { union { int __i[10]; volatile int __vi[10]; unsigned long __s[1
 #endif
 
 
-// TODO(kleisauke): Remove these two typedefs.
-#if defined(__NEED_pthread_mutex_t) && !defined(__DEFINED_pthread_mutex_t)
-typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void * /*volatile*/__p[6]; } __u; } pthread_mutex_t;
-#define __DEFINED_pthread_mutex_t
-#endif
-
-#if defined(__NEED_mtx_t) && !defined(__DEFINED_mtx_t)
-typedef struct { union { int __i[6]; volatile int __vi[6]; volatile void * /*volatile*/__p[6]; } __u; } mtx_t;
-#define __DEFINED_mtx_t
-#endif
-
-
 // END EMSCRIPTEN-SPECIFIC DEFINITIONS
 //
 // Below here are the shared musl definitions.  The emscripten-specific definitions above will take precedence

system/lib/libc/musl/arch/emscripten/bits/alltypes.h.in

@@ -37,10 +37,6 @@ TYPEDEF struct { alignas(8) long long __ll; long double __ld; } max_align_t;
 // to pass a pointer to a string denoting the WebGL canvases to transfer.
 TYPEDEF struct { union { int __i[10]; volatile int __vi[10]; unsigned long __s[10]; } __u; const char *_a_transferredcanvases; } pthread_attr_t;
 
-// TODO(kleisauke): Remove these two typedefs.
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void * /*volatile*/__p[6]; } __u; } pthread_mutex_t;
-TYPEDEF struct { union { int __i[6]; volatile int __vi[6]; volatile void * /*volatile*/__p[6]; } __u; } mtx_t;
-
 // END EMSCRIPTEN-SPECIFIC DEFINITIONS
 //
 // Below here are the shared musl definitions.  The emscripten-specific definitions above will take precedence

test/code_size/test_codesize_minimal_pthreads.json

@@ -1,10 +1,10 @@
 {
   "a.out.js": 7529,
   "a.out.js.gz": 3720,
-  "a.out.nodebug.wasm": 19590,
-  "a.out.nodebug.wasm.gz": 9031,
-  "total": 27119,
-  "total_gz": 12751,
+  "a.out.nodebug.wasm": 19588,
+  "a.out.nodebug.wasm.gz": 9025,
+  "total": 27117,
+  "total_gz": 12745,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",

test/code_size/test_codesize_minimal_pthreads_memgrowth.json

@@ -1,10 +1,10 @@
 {
   "a.out.js": 7956,
   "a.out.js.gz": 3920,
-  "a.out.nodebug.wasm": 19591,
-  "a.out.nodebug.wasm.gz": 9031,
-  "total": 27547,
-  "total_gz": 12951,
+  "a.out.nodebug.wasm": 19589,
+  "a.out.nodebug.wasm.gz": 9025,
+  "total": 27545,
+  "total_gz": 12945,
   "sent": [
     "a (memory)",
     "b (emscripten_get_now)",