summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2015-12-14 20:03:12 -0800
committerAlon Zakai <alonzakai@gmail.com>2015-12-14 20:03:12 -0800
commit7314f30d61b4850b2b4c7850901725ea287fd715 (patch)
treee7ea714fba89d80e42dec3a1829c18c45726680c
parentdcef40dbc73de2496c05476379603bdf521b34fe (diff)
downloadbinaryen-7314f30d61b4850b2b4c7850901725ea287fd715.tar.gz
binaryen-7314f30d61b4850b2b4c7850901725ea287fd715.tar.bz2
binaryen-7314f30d61b4850b2b4c7850901725ea287fd715.zip
emscripten_asm_const needs a prefix '_'
-rw-r--r--src/s2wasm.h3
-rw-r--r--test/dot_s/asm_const.wast4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/s2wasm.h b/src/s2wasm.h
index 5f2e1d497..759dcf44a 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -894,8 +894,7 @@ public:
}
std::string sig = getSig(curr);
sigsForCode[code].insert(sig);
- std::string fixedTarget = EMSCRIPTEN_ASM_CONST.str;
- fixedTarget += '_' + sig;
+ std::string fixedTarget = std::string("_") + EMSCRIPTEN_ASM_CONST.str + '_' + sig;
curr->target = cashew::IString(fixedTarget.c_str(), false);
arg->value = Literal(id);
// add import, if necessary
diff --git a/test/dot_s/asm_const.wast b/test/dot_s/asm_const.wast
index 76b0f4220..762856a8c 100644
--- a/test/dot_s/asm_const.wast
+++ b/test/dot_s/asm_const.wast
@@ -1,11 +1,11 @@
(module
(memory 0 4294967295 (segment 16 "{ Module.print(\"hello, world!\"); }\00"))
- (import $emscripten_asm_const_vi "env" "emscripten_asm_const_vi")
+ (import $_emscripten_asm_const_vi "env" "_emscripten_asm_const_vi")
(export "main" $main)
(func $main (result i32)
(block $fake_return_waka123
(block
- (call_import $emscripten_asm_const_vi
+ (call_import $_emscripten_asm_const_vi
(i32.const 0)
)
(br $fake_return_waka123