diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/asm2wasm.cpp | 4 | ||||
-rw-r--r-- | src/tools/wasm-merge.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/asm2wasm.cpp b/src/tools/asm2wasm.cpp index cc9464434..d5e5827c5 100644 --- a/src/tools/asm2wasm.cpp +++ b/src/tools/asm2wasm.cpp @@ -60,7 +60,7 @@ int main(int argc, const char *argv[]) { [](Options *o, const std::string& argument) { o->extra["mem init"] = argument; }) - .add("--mem-base", "-mb", "Set the location to write the memory initialization (--mem-init) file (GLOBAL_BASE in emscripten). If not provided, the memoryBase global import is used.", Options::Arguments::One, + .add("--mem-base", "-mb", "Set the location to write the memory initialization (--mem-init) file (GLOBAL_BASE in emscripten). If not provided, the __memory_base global import is used.", Options::Arguments::One, [](Options *o, const std::string& argument) { o->extra["mem base"] = argument; }) @@ -173,7 +173,7 @@ int main(int argc, const char *argv[]) { Expression* init; const auto &memBase = options.extra.find("mem base"); if (memBase == options.extra.end()) { - init = Builder(wasm).makeGetGlobal(Name("memoryBase"), i32); + init = Builder(wasm).makeGetGlobal(MEMORY_BASE, i32); } else { init = Builder(wasm).makeConst(Literal(int32_t(atoi(memBase->second.c_str())))); } diff --git a/src/tools/wasm-merge.cpp b/src/tools/wasm-merge.cpp index 70611e269..52f682e16 100644 --- a/src/tools/wasm-merge.cpp +++ b/src/tools/wasm-merge.cpp @@ -580,12 +580,12 @@ int main(int argc, const char* argv[]) { .add("--emit-text", "-S", "Emit text instead of binary for the output file", Options::Arguments::Zero, [&](Options *o, const std::string& argument) { emitBinary = false; }) - .add("--finalize-memory-base", "-fmb", "Finalize the env.memoryBase import", + .add("--finalize-memory-base", "-fmb", "Finalize the env.__memory_base import", Options::Arguments::One, [&](Options* o, const std::string& argument) { finalizeMemoryBase = atoi(argument.c_str()); }) - .add("--finalize-table-base", "-ftb", "Finalize the env.tableBase import", + .add("--finalize-table-base", "-ftb", "Finalize the env.__table_base import", Options::Arguments::One, [&](Options* o, const std::string& argument) { finalizeTableBase = atoi(argument.c_str()); |