Rename emscripten metadata key to reflect new unmangled names (#3813)

Turns out just removing the mangling wasn't enough for
emscripten to support both before and after versions.

See https://github.com/WebAssembly/binaryen/pull/3785

34 files changed, 34 insertions, 34 deletions

diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
index 89402046f..5eed4d4c4 100644
--- a/src/wasm/wasm-emscripten.cpp
+++ b/src/wasm/wasm-emscripten.cpp
@@ -423,7 +423,7 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata() {
   });
   meta << "\n  ],\n";
 
-  meta << "  \"externs\": [";
+  meta << "  \"globalImports\": [";
   commaFirst = true;
   ModuleUtils::iterImportedGlobals(wasm, [&](Global* import) {
     meta << nextElement() << '"' << import->base.str << '"';
diff --git a/test/lld/basic_safe_stack.wat.out b/test/lld/basic_safe_stack.wat.out
index 9500aea41..f39301a01 100644
--- a/test/lld/basic_safe_stack.wat.out
+++ b/test/lld/basic_safe_stack.wat.out
@@ -91,7 +91,7 @@
   "declares": [
     "__handle_stack_overflow"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/duplicate_imports.wat.out b/test/lld/duplicate_imports.wat.out
index 50f73f88d..221592373 100644
--- a/test/lld/duplicate_imports.wat.out
+++ b/test/lld/duplicate_imports.wat.out
@@ -72,7 +72,7 @@
   "declares": [
     "puts"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm.wat.mem.out b/test/lld/em_asm.wat.mem.out
index 2f11aeb55..2f9320cc4 100644
--- a/test/lld/em_asm.wat.mem.out
+++ b/test/lld/em_asm.wat.mem.out
@@ -78,7 +78,7 @@
   "declares": [
     "emscripten_asm_const_int"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm.wat.out b/test/lld/em_asm.wat.out
index c0261d891..7fe5c01b3 100644
--- a/test/lld/em_asm.wat.out
+++ b/test/lld/em_asm.wat.out
@@ -80,7 +80,7 @@
   "declares": [
     "emscripten_asm_const_int"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm64.wat.out b/test/lld/em_asm64.wat.out
index d4a8b6ded..39cf5302a 100644
--- a/test/lld/em_asm64.wat.out
+++ b/test/lld/em_asm64.wat.out
@@ -80,7 +80,7 @@
   "declares": [
     "emscripten_asm_const_int"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm_O0.wat.out b/test/lld/em_asm_O0.wat.out
index 74e545ad5..7a2fd262b 100644
--- a/test/lld/em_asm_O0.wat.out
+++ b/test/lld/em_asm_O0.wat.out
@@ -103,7 +103,7 @@
   "declares": [
     "emscripten_asm_const_int"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm_main_thread.wat.out b/test/lld/em_asm_main_thread.wat.out
index 31ee579c0..813da0428 100644
--- a/test/lld/em_asm_main_thread.wat.out
+++ b/test/lld/em_asm_main_thread.wat.out
@@ -204,7 +204,7 @@
   "declares": [
     "emscripten_asm_const_int_sync_on_main_thread"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm_pthread.wasm.out b/test/lld/em_asm_pthread.wasm.out
index 43eb27176..3db09111e 100644
--- a/test/lld/em_asm_pthread.wasm.out
+++ b/test/lld/em_asm_pthread.wasm.out
@@ -12867,7 +12867,7 @@
     "fd_write",
     "setTempRet0"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
index 904dfd2aa..642933f60 100644
--- a/test/lld/em_asm_shared.wat.out
+++ b/test/lld/em_asm_shared.wat.out
@@ -105,7 +105,7 @@
   "declares": [
     "emscripten_asm_const_int"
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__memory_base",
     "__table_base",
diff --git a/test/lld/em_asm_table.wat.out b/test/lld/em_asm_table.wat.out
index 9a6af1d7a..40bfcf122 100644
--- a/test/lld/em_asm_table.wat.out
+++ b/test/lld/em_asm_table.wat.out
@@ -37,7 +37,7 @@
     "emscripten_log",
     "emscripten_asm_const_int"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "dynCall_vii",
diff --git a/test/lld/em_js_O0.wat.out b/test/lld/em_js_O0.wat.out
index f882c9ff6..b674f45b2 100644
--- a/test/lld/em_js_O0.wat.out
+++ b/test/lld/em_js_O0.wat.out
@@ -18,7 +18,7 @@
   "tableSize": 0,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
   ],
diff --git a/test/lld/hello_world.passive.wat.out b/test/lld/hello_world.passive.wat.out
index a4c1a9c1b..247463069 100644
--- a/test/lld/hello_world.passive.wat.out
+++ b/test/lld/hello_world.passive.wat.out
@@ -44,7 +44,7 @@
   "declares": [
     "puts"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/hello_world.wat.mem.out b/test/lld/hello_world.wat.mem.out
index 9e8e50c7a..f43ccfe38 100644
--- a/test/lld/hello_world.wat.mem.out
+++ b/test/lld/hello_world.wat.mem.out
@@ -32,7 +32,7 @@
   "declares": [
     "puts"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/hello_world.wat.out b/test/lld/hello_world.wat.out
index 5f69eb918..a6e32608e 100644
--- a/test/lld/hello_world.wat.out
+++ b/test/lld/hello_world.wat.out
@@ -33,7 +33,7 @@
   "declares": [
     "puts"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/init.wat.out b/test/lld/init.wat.out
index 06ea07837..d66f6a764 100644
--- a/test/lld/init.wat.out
+++ b/test/lld/init.wat.out
@@ -44,7 +44,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/longjmp.wat.out b/test/lld/longjmp.wat.out
index 3cc23cbbd..8ff6c8387 100644
--- a/test/lld/longjmp.wat.out
+++ b/test/lld/longjmp.wat.out
@@ -151,7 +151,7 @@
     "setTempRet0",
     "free"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
index 343ad14f3..09a1b7579 100644
--- a/test/lld/main_module.wat.out
+++ b/test/lld/main_module.wat.out
@@ -60,7 +60,7 @@
   "declares": [
     "puts"
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__memory_base",
     "__table_base",
diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out
index 40852c77b..a3b61f439 100644
--- a/test/lld/main_module_table.wat.out
+++ b/test/lld/main_module_table.wat.out
@@ -15,7 +15,7 @@
   "tableSize": 0,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__stdio_write"
   ],
diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out
index f6771deb9..d8938bcc2 100644
--- a/test/lld/main_module_table_2.wat.out
+++ b/test/lld/main_module_table_2.wat.out
@@ -16,7 +16,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__stdio_write"
   ],
diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out
index f6771deb9..d8938bcc2 100644
--- a/test/lld/main_module_table_3.wat.out
+++ b/test/lld/main_module_table_3.wat.out
@@ -16,7 +16,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__stdio_write"
   ],
diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out
index f4a991eb3..c8c5c2099 100644
--- a/test/lld/main_module_table_4.wat.out
+++ b/test/lld/main_module_table_4.wat.out
@@ -17,7 +17,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__stdio_write",
     "__table_base"
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
index cccf422fc..f26ca8ae8 100644
--- a/test/lld/main_module_table_5.wat.out
+++ b/test/lld/main_module_table_5.wat.out
@@ -31,7 +31,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__stdio_write",
     "__table_base"
diff --git a/test/lld/recursive.wat.out b/test/lld/recursive.wat.out
index 029397fe7..3ff1371d8 100644
--- a/test/lld/recursive.wat.out
+++ b/test/lld/recursive.wat.out
@@ -90,7 +90,7 @@
   "declares": [
     "iprintf"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/recursive_safe_stack.wat.out b/test/lld/recursive_safe_stack.wat.out
index d906b777b..6e95b7165 100644
--- a/test/lld/recursive_safe_stack.wat.out
+++ b/test/lld/recursive_safe_stack.wat.out
@@ -180,7 +180,7 @@
     "printf",
     "__handle_stack_overflow"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/reserved_func_ptr.wat.out b/test/lld/reserved_func_ptr.wat.out
index d1924226f..a130b605c 100644
--- a/test/lld/reserved_func_ptr.wat.out
+++ b/test/lld/reserved_func_ptr.wat.out
@@ -125,7 +125,7 @@
   "declares": [
     "_Z4atoiPKc"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/safe_stack_standalone-wasm.wat.out b/test/lld/safe_stack_standalone-wasm.wat.out
index 1e598c4fa..c9ea4fe6c 100644
--- a/test/lld/safe_stack_standalone-wasm.wat.out
+++ b/test/lld/safe_stack_standalone-wasm.wat.out
@@ -178,7 +178,7 @@
   "declares": [
     "printf"
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/shared.wat.out b/test/lld/shared.wat.out
index 7731ae719..6370e7b9b 100644
--- a/test/lld/shared.wat.out
+++ b/test/lld/shared.wat.out
@@ -57,7 +57,7 @@
   "declares": [
     "puts"
   ],
-  "externs": [
+  "globalImports": [
     "__memory_base",
     "__table_base",
     "external_var",
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
index a0f4ee558..9baa3bf23 100644
--- a/test/lld/shared_add_to_table.wasm.out
+++ b/test/lld/shared_add_to_table.wasm.out
@@ -75,7 +75,7 @@
   "declares": [
     "_Z16waka_func_theirsi"
   ],
-  "externs": [
+  "globalImports": [
     "__stack_pointer",
     "__memory_base",
     "__table_base",
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out
index f0856db39..921a13e76 100644
--- a/test/lld/shared_longjmp.wat.out
+++ b/test/lld/shared_longjmp.wat.out
@@ -160,7 +160,7 @@
     "setTempRet0",
     "free"
   ],
-  "externs": [
+  "globalImports": [
     "__memory_base",
     "__table_base",
     "__THREW__",
diff --git a/test/lld/standalone-wasm-with-start.wat.out b/test/lld/standalone-wasm-with-start.wat.out
index 650ef4542..635485dbf 100644
--- a/test/lld/standalone-wasm-with-start.wat.out
+++ b/test/lld/standalone-wasm-with-start.wat.out
@@ -23,7 +23,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "_start"
diff --git a/test/lld/standalone-wasm.wat.out b/test/lld/standalone-wasm.wat.out
index d3a589c7d..99c07dea7 100644
--- a/test/lld/standalone-wasm.wat.out
+++ b/test/lld/standalone-wasm.wat.out
@@ -27,7 +27,7 @@
   "tableSize": 1,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "main"
diff --git a/test/lld/standalone-wasm2.wat.out b/test/lld/standalone-wasm2.wat.out
index 4f3cb355c..217fb9746 100644
--- a/test/lld/standalone-wasm2.wat.out
+++ b/test/lld/standalone-wasm2.wat.out
@@ -24,7 +24,7 @@
   "tableSize": 0,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
     "main"
diff --git a/test/lld/standalone-wasm3.wat.out b/test/lld/standalone-wasm3.wat.out
index 9f63753c5..936df6002 100644
--- a/test/lld/standalone-wasm3.wat.out
+++ b/test/lld/standalone-wasm3.wat.out
@@ -17,7 +17,7 @@
   "tableSize": 0,
   "declares": [
   ],
-  "externs": [
+  "globalImports": [
   ],
   "exports": [
   ],