summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/shared-constants.h1
-rw-r--r--src/tools/wasm-emscripten-finalize.cpp9
-rw-r--r--src/wasm/wasm.cpp1
-rw-r--r--test/lld/em_asm_shared.wat.out4
-rw-r--r--test/lld/shared.wat.out4
-rw-r--r--test/lld/shared_add_to_table.wasm.out4
-rw-r--r--test/lld/shared_longjmp.wat.out4
7 files changed, 8 insertions, 19 deletions
diff --git a/src/shared-constants.h b/src/shared-constants.h
index 5520f15ac..59c7af3ba 100644
--- a/src/shared-constants.h
+++ b/src/shared-constants.h
@@ -21,7 +21,6 @@
namespace wasm {
-extern Name WASM_CALL_CTORS;
extern Name MEMORY_BASE;
extern Name TABLE_BASE;
extern Name STACK_POINTER;
diff --git a/src/tools/wasm-emscripten-finalize.cpp b/src/tools/wasm-emscripten-finalize.cpp
index 38a55e5cb..c69ec9bb5 100644
--- a/src/tools/wasm-emscripten-finalize.cpp
+++ b/src/tools/wasm-emscripten-finalize.cpp
@@ -298,15 +298,6 @@ int main(int argc, const char* argv[]) {
passRunner.run();
- if (sideModule) {
- BYN_TRACE("finalizing as side module\n");
- // The emscripten PIC ABI still expects a function named
- // __post_instantiate to be exported by side module.
- if (auto* e = wasm.getExportOrNull(WASM_CALL_CTORS)) {
- e->name = "__post_instantiate";
- }
- }
-
BYN_TRACE("generated metadata\n");
// Substantial changes to the wasm are done, enough to create the metadata.
std::string metadata = generator.generateEmscriptenMetadata();
diff --git a/src/wasm/wasm.cpp b/src/wasm/wasm.cpp
index 1380b3b48..34dcf75ee 100644
--- a/src/wasm/wasm.cpp
+++ b/src/wasm/wasm.cpp
@@ -50,7 +50,6 @@ const char* TypedFunctionReferencesFeature = "typed-function-references";
} // namespace UserSections
} // namespace BinaryConsts
-Name WASM_CALL_CTORS("__wasm_call_ctors");
Name MEMORY_BASE("__memory_base");
Name TABLE_BASE("__table_base");
Name STACK_POINTER("__stack_pointer");
diff --git a/test/lld/em_asm_shared.wat.out b/test/lld/em_asm_shared.wat.out
index 2f3635d11..904dfd2aa 100644
--- a/test/lld/em_asm_shared.wat.out
+++ b/test/lld/em_asm_shared.wat.out
@@ -18,7 +18,7 @@
(global $global$2 i32 (i32.const 4))
(global $global$3 i32 (i32.const 6))
(global $global$4 i32 (i32.const 90))
- (export "__post_instantiate" (func $__wasm_call_ctors))
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
(export "__original_main" (func $__original_main))
(export "_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJEEE6bufferE" (global $global$0))
(export "_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiiEEE6bufferE" (global $global$1))
@@ -114,7 +114,7 @@
"_ZN20__em_asm_sig_builderI19__em_asm_type_tupleIJiEEE6bufferE"
],
"exports": [
- "__post_instantiate",
+ "__wasm_call_ctors",
"__original_main",
"main"
],
diff --git a/test/lld/shared.wat.out b/test/lld/shared.wat.out
index a960c97ee..7731ae719 100644
--- a/test/lld/shared.wat.out
+++ b/test/lld/shared.wat.out
@@ -13,7 +13,7 @@
(import "env" "puts" (func $puts (param i32) (result i32)))
(global $global$0 i32 (i32.const 16))
(global $global$1 i32 (i32.const 20))
- (export "__post_instantiate" (func $__wasm_call_ctors))
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
(export "_Z13print_messagev" (func $print_message\28\29))
(export "ptr_puts" (global $global$0))
(export "ptr_local_func" (global $global$1))
@@ -65,7 +65,7 @@
"_Z13print_messagev"
],
"exports": [
- "__post_instantiate",
+ "__wasm_call_ctors",
"_Z13print_messagev"
],
"namedGlobals": {
diff --git a/test/lld/shared_add_to_table.wasm.out b/test/lld/shared_add_to_table.wasm.out
index 692294eb3..a0f4ee558 100644
--- a/test/lld/shared_add_to_table.wasm.out
+++ b/test/lld/shared_add_to_table.wasm.out
@@ -16,7 +16,7 @@
(import "env" "_Z16waka_func_theirsi" (func $waka_func_theirs\28int\29 (param i32) (result i32)))
(global $global$0 i32 (i32.const 0))
(global $global$1 i32 (i32.const 0))
- (export "__post_instantiate" (func $__wasm_call_ctors))
+ (export "__wasm_call_ctors" (func $__wasm_call_ctors))
(export "__wasm_apply_relocs" (func $__wasm_apply_relocs))
(export "_Z14waka_func_minei" (func $waka_func_mine\28int\29))
(export "__original_main" (func $__original_main))
@@ -85,7 +85,7 @@
"waka_others"
],
"exports": [
- "__post_instantiate",
+ "__wasm_call_ctors",
"__wasm_apply_relocs",
"_Z14waka_func_minei",
"__original_main",
diff --git a/test/lld/shared_longjmp.wat.out b/test/lld/shared_longjmp.wat.out
index 68c84ed13..f0856db39 100644
--- a/test/lld/shared_longjmp.wat.out
+++ b/test/lld/shared_longjmp.wat.out
@@ -25,7 +25,7 @@
(import "env" "free" (func $fimport$7 (param i32)))
(global $global$0 i32 (i32.const 0))
(global $global$1 i32 (i32.const 4))
- (export "__post_instantiate" (func $0))
+ (export "__wasm_call_ctors" (func $0))
(export "_start" (func $2))
(export "__THREW__" (global $global$0))
(export "__threwValue" (global $global$1))
@@ -168,7 +168,7 @@
"__threwValue"
],
"exports": [
- "__post_instantiate",
+ "__wasm_call_ctors",
"_start",
"dynCall_vii"
],