diff --git a/system/lib/compiler-rt/emscripten_exception_builtins.c b/system/lib/compiler-rt/emscripten_exception_builtins.c
index 0c29c243f4818..97fcb87b73c3a 100644
--- a/system/lib/compiler-rt/emscripten_exception_builtins.c
+++ b/system/lib/compiler-rt/emscripten_exception_builtins.c
@@ -9,12 +9,13 @@
  * See: https://llvm.org/doxygen/WebAssemblyLowerEmscriptenEHSjLj_8cpp.html
  */
 
+#include <stdint.h>
 #include <threads.h>
 
-thread_local int __THREW__ = 0;
+thread_local uintptr_t __THREW__ = 0;
 thread_local int __threwValue = 0;
 
-void setThrew(int threw, int value) {
+void setThrew(uintptr_t threw, int value) {
   if (__THREW__ == 0) {
     __THREW__ = threw;
     __threwValue = value;
diff --git a/system/lib/compiler-rt/emscripten_setjmp.c b/system/lib/compiler-rt/emscripten_setjmp.c
index 5be8554ea19e3..756a82f7240e8 100644
--- a/system/lib/compiler-rt/emscripten_setjmp.c
+++ b/system/lib/compiler-rt/emscripten_setjmp.c
@@ -9,17 +9,21 @@
 #include <stdlib.h>
 #include <setjmp.h>
 
-static uint32_t setjmpId = 0;
+// 0 - Nothing thrown
+// 1 - Exception thrown
+// Other values - jmpbuf pointer in the case that longjmp was thrown
+static uintptr_t setjmpId = 0;
 
 typedef struct TableEntry {
-  uint32_t id, label;
+  uintptr_t id;
+  uint32_t label;
 } TableEntry;
 
 extern void setTempRet0(uint32_t value);
 extern void setThrew(uintptr_t threw, int value);
 extern void _emscripten_throw_longjmp(); // defined in src/library.js
 
-TableEntry* saveSetjmp(uint32_t* env, uint32_t label, TableEntry* table, uint32_t size) {
+TableEntry* saveSetjmp(uintptr_t* env, uint32_t label, TableEntry* table, uint32_t size) {
   // Not particularly fast: slow table lookup of setjmpId to label. But setjmp
   // prevents relooping anyhow, so slowness is to be expected. And typical case
   // is 1 setjmp per invocation, or less.
@@ -45,10 +49,10 @@ TableEntry* saveSetjmp(uint32_t* env, uint32_t label, TableEntry* table, uint32_
   return table;
 }
 
-uint32_t testSetjmp(uint32_t id, TableEntry* table, uint32_t size) {
-  uint32_t i = 0, curr;
+uint32_t testSetjmp(uintptr_t id, TableEntry* table, uint32_t size) {
+  uint32_t i = 0;
   while (i < size) {
-    uint32_t curr = table[i].id;
+    uintptr_t curr = table[i].id;
     if (curr == 0) break;
     if (curr == id) {
       return table[i].label;