diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-11-05 10:40:14 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-05 10:40:14 -0800 |
commit | f69eed7731abf65fa76adb8878f9ff352ffb25c3 (patch) | |
tree | 52e023cdfdb6df2ca008d601e532d08146e07d03 /emscripten.py | |
parent | 7016f3ec866da493a82586ea9ea1a0895514b251 (diff) |
support ASM_JS=2 not just in test runner, and remove some unneeded uses in test suite
Diffstat (limited to 'emscripten.py')
-rwxr-xr-x | emscripten.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py index dbea6eb2..5576baba 100755 --- a/emscripten.py +++ b/emscripten.py @@ -578,7 +578,7 @@ var asm = (function(global, env, buffer) { var HEAPU32 = new global.Uint32Array(buffer); var HEAPF32 = new global.Float32Array(buffer); var HEAPF64 = new global.Float64Array(buffer); -''' % (asm_setup, "'use asm';" if not forwarded_json['Types']['hasInlineJS'] and not settings['SIDE_MODULE'] else "'almost asm';") + '\n' + asm_global_vars + ''' +''' % (asm_setup, "'use asm';" if not forwarded_json['Types']['hasInlineJS'] and not settings['SIDE_MODULE'] and settings['ASM_JS'] == 1 else "'almost asm';") + '\n' + asm_global_vars + ''' var __THREW__ = 0; var threwValue = 0; var setjmpId = 0; |