diff --git a/system/lib/libc/musl/src/internal/pthread_impl.h b/system/lib/libc/musl/src/internal/pthread_impl.h
index a6e35cd402899..a326b8d9a5786 100644
--- a/system/lib/libc/musl/src/internal/pthread_impl.h
+++ b/system/lib/libc/musl/src/internal/pthread_impl.h
@@ -131,7 +131,7 @@ enum {
 // XXX Emscripten: The spec allows detecting when multiple write locks would deadlock, so use an extra field
 // _rw_wr_owner to record which thread owns the write lock in order to avoid hangs.
 // Points to the pthread that currently has the write lock.
-#define _rw_wr_owner __u.__p[3]
+#define _rw_wr_owner __u.__vi[3]
 #endif
 #define _b_lock __u.__vi[0]
 #define _b_waiters __u.__vi[1]
diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c
index 60a2902ba8730..b147cb92ea9f5 100644
--- a/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c
+++ b/system/lib/libc/musl/src/thread/pthread_rwlock_timedwrlock.c
@@ -5,7 +5,7 @@ int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct tim
 #ifdef __EMSCRIPTEN__
 	/// XXX Emscripten: The spec allows detecting when multiple write locks would deadlock, which we do here to avoid hangs.
 	/// If attempting to lock the write lock that we already own, error out.
-	if (rw->_rw_wr_owner == (void *)pthread_self()) return EDEADLK;
+	if (rw->_rw_wr_owner == __pthread_self()->tid) return EDEADLK;
 #endif
 	int r, t;
 
@@ -27,7 +27,7 @@ int __pthread_rwlock_timedwrlock(pthread_rwlock_t *restrict rw, const struct tim
 #ifdef __EMSCRIPTEN__
 	/// XXX Emscripten: The spec allows detecting when multiple write locks would deadlock, which we do here to avoid hangs.
 	/// Mark this thread as the owner of this write lock.
-	rw->_rw_wr_owner = (void *)pthread_self();
+	rw->_rw_wr_owner = __pthread_self()->tid;
 #endif
 	return r;
 }
diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c
index d03cad43169dc..e275bdaf1a1f1 100644
--- a/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c
+++ b/system/lib/libc/musl/src/thread/pthread_rwlock_trywrlock.c
@@ -6,7 +6,7 @@ int __pthread_rwlock_trywrlock(pthread_rwlock_t *rw)
 #ifdef __EMSCRIPTEN__
 	/// XXX Emscripten: The spec allows detecting when multiple write locks would deadlock, which we do here to avoid hangs.
 	/// Mark this thread to own the write lock, to ignore multiple attempts to lock.
-	rw->_rw_wr_owner = (void *)pthread_self();
+	rw->_rw_wr_owner = __pthread_self()->tid;
 #endif
 	return 0;
 }
diff --git a/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c b/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c
index 34879145df875..7a55a085a0288 100644
--- a/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c
+++ b/system/lib/libc/musl/src/thread/pthread_rwlock_unlock.c
@@ -7,7 +7,7 @@ int __pthread_rwlock_unlock(pthread_rwlock_t *rw)
 #ifdef __EMSCRIPTEN__
 	/// XXX Emscripten: The spec allows detecting when multiple write locks would deadlock, which we do here to avoid hangs.
 	/// Mark this thread to not own the write lock anymore.
-	if (rw->_rw_wr_owner == (void *)pthread_self()) rw->_rw_wr_owner = 0;
+	if (rw->_rw_wr_owner == __pthread_self()->tid) rw->_rw_wr_owner = 0;
 #endif
 
 	do {