12 files changed, 45 insertions, 30 deletions
diff --git a/test/lld/duplicate_imports.wast.out b/test/lld/duplicate_imports.wast.out
index f01f8bb96..e7d36127f 100644
--- a/test/lld/duplicate_imports.wast.out
+++ b/test/lld/duplicate_imports.wast.out
@@ -123,16 +123,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
     "main",
-    "__heap_base",
-    "__data_end",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66128",
+    "__data_end" : "581"
+  },
   "invokeFuncs": [
     "invoke_ffd"
   ]
diff --git a/test/lld/em_asm.wast.mem.out b/test/lld/em_asm.wast.mem.out
index 08bca193e..647342134 100644
--- a/test/lld/em_asm.wast.mem.out
+++ b/test/lld/em_asm.wast.mem.out
@@ -248,16 +248,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66192",
+    "__data_end" : "652"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/em_asm.wast.out b/test/lld/em_asm.wast.out
index 50d4628c9..5e293f541 100644
--- a/test/lld/em_asm.wast.out
+++ b/test/lld/em_asm.wast.out
@@ -249,16 +249,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66192",
+    "__data_end" : "652"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/em_asm_O0.wast.out b/test/lld/em_asm_O0.wast.out
index c45799980..099da3746 100644
--- a/test/lld/em_asm_O0.wast.out
+++ b/test/lld/em_asm_O0.wast.out
@@ -109,16 +109,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
     "main",
-    "__heap_base",
-    "__data_end",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66192",
+    "__data_end" : "652"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/em_asm_table.wast.out b/test/lld/em_asm_table.wast.out
index ae3675d40..06cfc9fc6 100644
--- a/test/lld/em_asm_table.wast.out
+++ b/test/lld/em_asm_table.wast.out
@@ -80,7 +80,6 @@
     "_dynCall_iiii"
   ],
   "exports": [
-    "__data_end",
     "stackSave",
     "stackAlloc",
     "stackRestore",
@@ -88,6 +87,9 @@
     "dynCall_vii",
     "dynCall_iiii"
   ],
+  "namedGlobals": {
+    "__data_end" : "1048"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/em_js_O0.wast.out b/test/lld/em_js_O0.wast.out
index 9b3307d5e..385daf8d5 100644
--- a/test/lld/em_js_O0.wast.out
+++ b/test/lld/em_js_O0.wast.out
@@ -61,13 +61,15 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "__heap_base",
-    "__data_end",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "5250112",
+    "__data_end" : "7232"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/hello_world.wast.mem.out b/test/lld/hello_world.wast.mem.out
index 32f8ddc14..ce0c93510 100644
--- a/test/lld/hello_world.wast.mem.out
+++ b/test/lld/hello_world.wast.mem.out
@@ -84,16 +84,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66128",
+    "__data_end" : "581"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/hello_world.wast.out b/test/lld/hello_world.wast.out
index 20ffaf2cd..20539c0d5 100644
--- a/test/lld/hello_world.wast.out
+++ b/test/lld/hello_world.wast.out
@@ -85,16 +85,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66128",
+    "__data_end" : "581"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/init.wast.out b/test/lld/init.wast.out
index 90c95263b..e9ca29152 100644
--- a/test/lld/init.wast.out
+++ b/test/lld/init.wast.out
@@ -96,16 +96,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66112",
+    "__data_end" : "576"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/recursive.wast.out b/test/lld/recursive.wast.out
index 95f82f767..be0a0f007 100644
--- a/test/lld/recursive.wast.out
+++ b/test/lld/recursive.wast.out
@@ -142,16 +142,17 @@
     "___growWasmMemory"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
     "stackRestore",
     "__growWasmMemory"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66128",
+    "__data_end" : "587"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/reserved_func_ptr.wast.out b/test/lld/reserved_func_ptr.wast.out
index 6afc10291..86d61bc82 100644
--- a/test/lld/reserved_func_ptr.wast.out
+++ b/test/lld/reserved_func_ptr.wast.out
@@ -178,10 +178,7 @@
     "_dynCall_viii"
   ],
   "exports": [
-    "memory",
     "__wasm_call_ctors",
-    "__heap_base",
-    "__data_end",
     "main",
     "stackSave",
     "stackAlloc",
@@ -189,6 +186,10 @@
     "__growWasmMemory",
     "dynCall_viii"
   ],
+  "namedGlobals": {
+    "__heap_base" : "66112",
+    "__data_end" : "568"
+  },
   "invokeFuncs": [
   ]
 }
diff --git a/test/lld/shared.wast.out b/test/lld/shared.wast.out
index c4f110972..67f4739dd 100644
--- a/test/lld/shared.wast.out
+++ b/test/lld/shared.wast.out
@@ -68,6 +68,8 @@
     "print_message",
     "__post_instantiate"
   ],
+  "namedGlobals": {
+  },
   "invokeFuncs": [
   ]
 }