Remove final remnants of name mangling from wasm-emscripten (#3785)

See https://github.com/emscripten-core/emscripten/pull/13847

11 files changed, 42 insertions, 42 deletions

diff --git a/src/wasm/wasm-emscripten.cpp b/src/wasm/wasm-emscripten.cpp
index 5b08b4641..89402046f 100644
--- a/src/wasm/wasm-emscripten.cpp
+++ b/src/wasm/wasm-emscripten.cpp
@@ -426,7 +426,7 @@ std::string EmscriptenGlueGenerator::generateEmscriptenMetadata() {
   meta << "  \"externs\": [";
   commaFirst = true;
   ModuleUtils::iterImportedGlobals(wasm, [&](Global* import) {
-    meta << nextElement() << "\"_" << import->base.str << '"';
+    meta << nextElement() << '"' << import->base.str << '"';
   });
   meta << "\n  ],\n";
 
diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
index dac8a31e2..2f3635d11 100644
--- a/test/lld/em_asm_shared.wat.out
+++ b/test/lld/em_asm_shared.wat.out
@@ -106,12 +106,12 @@
     "emscripten_asm_const_int"
   ],
   "externs": [
-    "___stack_pointer",
-    "___memory_base",
-    "___table_base",
-    "__ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE",
-    "__ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiiEEE6bufferE",
-    "__ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE"
+    "__stack_pointer",
+    "__memory_base",
+    "__table_base",
+    "_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE",
+    "_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiiEEE6bufferE",
+    "_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE"
   ],
   "exports": [
     "__post_instantiate",
diff --git a/test/lld/main_module.wat.out b/test/lld/main_module.wat.out
index 9cc6cd268..343ad14f3 100644
--- a/test/lld/main_module.wat.out
+++ b/test/lld/main_module.wat.out
@@ -61,12 +61,12 @@
     "puts"
   ],
   "externs": [
-    "___stack_pointer",
-    "___memory_base",
-    "___table_base",
-    "_external_var",
-    "_puts",
-    "__Z13print_messagev"
+    "__stack_pointer",
+    "__memory_base",
+    "__table_base",
+    "external_var",
+    "puts",
+    "_Z13print_messagev"
   ],
   "exports": [
     "__wasm_call_ctors",
diff --git a/test/lld/main_module_table.wat.out b/test/lld/main_module_table.wat.out
index d0d59fe45..40852c77b 100644
--- a/test/lld/main_module_table.wat.out
+++ b/test/lld/main_module_table.wat.out
@@ -16,8 +16,8 @@
   "declares": [
   ],
   "externs": [
-    "___stack_pointer",
-    "___stdio_write"
+    "__stack_pointer",
+    "__stdio_write"
   ],
   "exports": [
     "__stdio_write"
diff --git a/test/lld/main_module_table_2.wat.out b/test/lld/main_module_table_2.wat.out
index ef4c2486e..f6771deb9 100644
--- a/test/lld/main_module_table_2.wat.out
+++ b/test/lld/main_module_table_2.wat.out
@@ -17,8 +17,8 @@
   "declares": [
   ],
   "externs": [
-    "___stack_pointer",
-    "___stdio_write"
+    "__stack_pointer",
+    "__stdio_write"
   ],
   "exports": [
     "__stdio_write"
diff --git a/test/lld/main_module_table_3.wat.out b/test/lld/main_module_table_3.wat.out
index ef4c2486e..f6771deb9 100644
--- a/test/lld/main_module_table_3.wat.out
+++ b/test/lld/main_module_table_3.wat.out
@@ -17,8 +17,8 @@
   "declares": [
   ],
   "externs": [
-    "___stack_pointer",
-    "___stdio_write"
+    "__stack_pointer",
+    "__stdio_write"
   ],
   "exports": [
     "__stdio_write"
diff --git a/test/lld/main_module_table_4.wat.out b/test/lld/main_module_table_4.wat.out
index 1d5b8fbeb..f4a991eb3 100644
--- a/test/lld/main_module_table_4.wat.out
+++ b/test/lld/main_module_table_4.wat.out
@@ -18,9 +18,9 @@
   "declares": [
   ],
   "externs": [
-    "___stack_pointer",
-    "___stdio_write",
-    "___table_base"
+    "__stack_pointer",
+    "__stdio_write",
+    "__table_base"
   ],
   "exports": [
     "__stdio_write"
diff --git a/test/lld/main_module_table_5.wat.out b/test/lld/main_module_table_5.wat.out
index ea1671b07..cccf422fc 100644
--- a/test/lld/main_module_table_5.wat.out
+++ b/test/lld/main_module_table_5.wat.out
@@ -32,9 +32,9 @@
   "declares": [
   ],
   "externs": [
-    "___stack_pointer",
-    "___stdio_write",
-    "___table_base"
+    "__stack_pointer",
+    "__stdio_write",
+    "__table_base"
   ],
   "exports": [
     "__stdio_write",
diff --git a/test/lld/shared.wat.out b/test/lld/shared.wat.out
index dd98de549..a960c97ee 100644
--- a/test/lld/shared.wat.out
+++ b/test/lld/shared.wat.out
@@ -58,11 +58,11 @@
     "puts"
   ],
   "externs": [
-    "___memory_base",
-    "___table_base",
-    "_external_var",
-    "_puts",
-    "__Z13print_messagev"
+    "__memory_base",
+    "__table_base",
+    "external_var",
+    "puts",
+    "_Z13print_messagev"
   ],
   "exports": [
     "__post_instantiate",
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
index 85f6e2f87..692294eb3 100644
--- a/test/lld/shared_add_to_table.wasm.out
+++ b/test/lld/shared_add_to_table.wasm.out
@@ -76,13 +76,13 @@
     "_Z16waka_func_theirsi"
   ],
   "externs": [
-    "___stack_pointer",
-    "___memory_base",
-    "___table_base",
-    "__Z16waka_func_theirsi",
-    "__Z14waka_func_minei",
-    "_waka_mine",
-    "_waka_others"
+    "__stack_pointer",
+    "__memory_base",
+    "__table_base",
+    "_Z16waka_func_theirsi",
+    "_Z14waka_func_minei",
+    "waka_mine",
+    "waka_others"
   ],
   "exports": [
     "__post_instantiate",
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out
index b657d6c46..68c84ed13 100644
--- a/test/lld/shared_longjmp.wat.out
+++ b/test/lld/shared_longjmp.wat.out
@@ -161,11 +161,11 @@
     "free"
   ],
   "externs": [
-    "___memory_base",
-    "___table_base",
-    "___THREW__",
-    "_emscripten_longjmp",
-    "___threwValue"
+    "__memory_base",
+    "__table_base",
+    "__THREW__",
+    "emscripten_longjmp",
+    "__threwValue"
   ],
   "exports": [
     "__post_instantiate",