diff options
| author | Derek Schuff <dschuff@chromium.org> | 2016-10-14 10:27:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-14 10:27:36 -0700 |
| commit | 58f7d6cd477701d7fb4c87ffa9e795ddc6423abb (patch) | |
| tree | 9bda4f141e0ffffea5e3556377ca6d463ea1834a /src/tools/s2wasm.cpp | |
| parent | 87c3aab6500f2a3a3ca8cecfaf65cc14e407a0cd (diff) | |
| download | binaryen-58f7d6cd477701d7fb4c87ffa9e795ddc6423abb.tar.gz binaryen-58f7d6cd477701d7fb4c87ffa9e795ddc6423abb.tar.bz2 binaryen-58f7d6cd477701d7fb4c87ffa9e795ddc6423abb.zip | |
Import memory instead of defining/exporting it when using emscripten glue (#777)
The emscripten JS module code creates the memory using the native wasm
APIs, and imports that into the wasm module.
Diffstat (limited to 'src/tools/s2wasm.cpp')
| -rw-r--r-- | src/tools/s2wasm.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/s2wasm.cpp b/src/tools/s2wasm.cpp index 8c36a0d58..ef5d276d3 100644 --- a/src/tools/s2wasm.cpp +++ b/src/tools/s2wasm.cpp @@ -132,7 +132,8 @@ int main(int argc, const char *argv[]) { if (options.debug) std::cerr << "Global base " << globalBase << '\n'; Linker linker(globalBase, stackAllocation, initialMem, maxMem, - ignoreUnknownSymbols, startFunction, options.debug); + generateEmscriptenGlue, ignoreUnknownSymbols, startFunction, + options.debug); S2WasmBuilder mainbuilder(input.c_str(), options.debug); linker.linkObject(mainbuilder); |