summaryrefslogtreecommitdiff
path: root/src/s2wasm-main.cpp
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2016-04-22 13:35:22 -0700
committerDerek Schuff <dschuff@chromium.org>2016-04-22 13:35:22 -0700
commitc12647ea31f3bb312e721ca8ca6a53246733106d (patch)
tree9280efe8aed28e6bd42e05818c2b1140d5eeb3b7 /src/s2wasm-main.cpp
parent41b62f9e8c525f899177a7d34cf24312e65b1337 (diff)
downloadbinaryen-c12647ea31f3bb312e721ca8ca6a53246733106d.tar.gz
binaryen-c12647ea31f3bb312e721ca8ca6a53246733106d.tar.bz2
binaryen-c12647ea31f3bb312e721ca8ca6a53246733106d.zip
Simplify statics, segments, and relocations (#380)
Also defer address assignment until layout time in preparation for separating linker objects out from Linker
Diffstat (limited to 'src/s2wasm-main.cpp')
-rw-r--r--src/s2wasm-main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/s2wasm-main.cpp b/src/s2wasm-main.cpp
index a0fb5a1b5..c6a77c583 100644
--- a/src/s2wasm-main.cpp
+++ b/src/s2wasm-main.cpp
@@ -102,7 +102,8 @@ int main(int argc, const char *argv[]) {
: 0;
if (options.debug) std::cerr << "Global base " << globalBase << '\n';
Linker lm(wasm, globalBase, stackAllocation, initialMem, maxMem,
- ignoreUnknownSymbols, startFunction, options.debug);
+ ignoreUnknownSymbols, startFunction, options.debug);
+
S2WasmBuilder s2wasm(wasm, input.c_str(), options.debug, lm);
std::stringstream meta;