diff --git a/system/lib/dlmalloc.c b/system/lib/dlmalloc.c
index 68082483e07ca..dd28625fc4f8c 100644
--- a/system/lib/dlmalloc.c
+++ b/system/lib/dlmalloc.c
@@ -2917,7 +2917,7 @@ static size_t traverse_and_check(mstate m);
 #define treebin_at(M,i)     (&((M)->treebins[i]))
 
 /* assign tree index for size S to variable I. Use x86 asm if possible  */
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__))
 #define compute_tree_index(S, I)\
 {\
 unsigned int X = S >> TREEBIN_SHIFT;\
@@ -3020,7 +3020,7 @@ I = (K << 1) + ((S >> (K + (TREEBIN_SHIFT-1)) & 1));\
 
 /* index corresponding to given bit. Use x86 asm if possible */
 
-#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
+#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__) || defined(__EMSCRIPTEN__))
 #define compute_bit2idx(X, I)\
 {\
 unsigned int J;\
diff --git a/test/other/metadce/test_metadce_cxx_ctors1.size b/test/other/metadce/test_metadce_cxx_ctors1.size
index 826d853f01d0f..5bf1370e78881 100644
--- a/test/other/metadce/test_metadce_cxx_ctors1.size
+++ b/test/other/metadce/test_metadce_cxx_ctors1.size
@@ -1 +1 @@
-123858
+123606
diff --git a/test/other/metadce/test_metadce_cxx_ctors2.size b/test/other/metadce/test_metadce_cxx_ctors2.size
index 816277f4ecff6..e6c7782bc7180 100644
--- a/test/other/metadce/test_metadce_cxx_ctors2.size
+++ b/test/other/metadce/test_metadce_cxx_ctors2.size
@@ -1 +1 @@
-123778
+123525
diff --git a/test/other/metadce/test_metadce_cxx_except.size b/test/other/metadce/test_metadce_cxx_except.size
index d4eca728259da..49866e5b8cd27 100644
--- a/test/other/metadce/test_metadce_cxx_except.size
+++ b/test/other/metadce/test_metadce_cxx_except.size
@@ -1 +1 @@
-165031
+164813
diff --git a/test/other/metadce/test_metadce_cxx_except_wasm.size b/test/other/metadce/test_metadce_cxx_except_wasm.size
index 7ac875b989b1c..cdf0d06fe3d87 100644
--- a/test/other/metadce/test_metadce_cxx_except_wasm.size
+++ b/test/other/metadce/test_metadce_cxx_except_wasm.size
@@ -1 +1 @@
-137169
+136926
diff --git a/test/other/metadce/test_metadce_cxx_mangle.size b/test/other/metadce/test_metadce_cxx_mangle.size
index b6005b4baf686..24c98c675d2f4 100644
--- a/test/other/metadce/test_metadce_cxx_mangle.size
+++ b/test/other/metadce/test_metadce_cxx_mangle.size
@@ -1 +1 @@
-220199
+219926
diff --git a/test/other/metadce/test_metadce_cxx_noexcept.size b/test/other/metadce/test_metadce_cxx_noexcept.size
index 85ac58c8d69b8..8d33181fda3a3 100644
--- a/test/other/metadce/test_metadce_cxx_noexcept.size
+++ b/test/other/metadce/test_metadce_cxx_noexcept.size
@@ -1 +1 @@
-126598
+126359
diff --git a/test/other/metadce/test_metadce_mem_O3.size b/test/other/metadce/test_metadce_mem_O3.size
index 75d59858d0564..1a27b802a8178 100644
--- a/test/other/metadce/test_metadce_mem_O3.size
+++ b/test/other/metadce/test_metadce_mem_O3.size
@@ -1 +1 @@
-5894
+5381
diff --git a/test/other/metadce/test_metadce_mem_O3_grow.size b/test/other/metadce/test_metadce_mem_O3_grow.size
index 68ac5065455c9..a7b264f60d9fb 100644
--- a/test/other/metadce/test_metadce_mem_O3_grow.size
+++ b/test/other/metadce/test_metadce_mem_O3_grow.size
@@ -1 +1 @@
-5895
+5382
diff --git a/test/other/metadce/test_metadce_mem_O3_grow_standalone.size b/test/other/metadce/test_metadce_mem_O3_grow_standalone.size
index 7251971d3390e..600eb9a405cfb 100644
--- a/test/other/metadce/test_metadce_mem_O3_grow_standalone.size
+++ b/test/other/metadce/test_metadce_mem_O3_grow_standalone.size
@@ -1 +1 @@
-6208
+5689
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone.size b/test/other/metadce/test_metadce_mem_O3_standalone.size
index 5dac0c1814034..a0096d7853f16 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone.size
+++ b/test/other/metadce/test_metadce_mem_O3_standalone.size
@@ -1 +1 @@
-6131
+5612
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_lib.size b/test/other/metadce/test_metadce_mem_O3_standalone_lib.size
index 9f8c8a0907901..70bea13d82fe5 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone_lib.size
+++ b/test/other/metadce/test_metadce_mem_O3_standalone_lib.size
@@ -1 +1 @@
-5911
+5384
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg.size b/test/other/metadce/test_metadce_mem_O3_standalone_narg.size
index 01bc0fc5fb539..9711d170bf5c3 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone_narg.size
+++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg.size
@@ -1 +1 @@
-5941
+5414
diff --git a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.size b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.size
index de1a6219dcd37..7137ddbe1890d 100644
--- a/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.size
+++ b/test/other/metadce/test_metadce_mem_O3_standalone_narg_flto.size
@@ -1 +1 @@
-4525
+4224