aboutsummaryrefslogtreecommitdiff
path: root/emscripten.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-05-01 10:01:16 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-05-01 10:01:16 -0700
commit18c03af5f0ee66eb0d75ba3892cd31c72ea6d5c2 (patch)
tree499f1d85ab2a8431a1137cecb8f8fb82d4d41f7c /emscripten.py
parent48ae14de71a389f29fdb6542e04e1c805788f5bb (diff)
parentcb42d258c2ca1035cac73e7635992d997f9df735 (diff)
Merge branch 'newtriple' into incoming
Diffstat (limited to 'emscripten.py')
-rwxr-xr-xemscripten.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py
index 6c758942..f4bfed82 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -529,7 +529,7 @@ var asm = (function(global, env, buffer) {
var ret = 0;
ret = STACKTOP;
STACKTOP = (STACKTOP + size)|0;
- STACKTOP = ((STACKTOP + 3)>>2)<<2;
+''' + ('STACKTOP = ((STACKTOP + 3)>>2)<<2;' if settings['TARGET_X86'] else 'STACKTOP = ((STACKTOP + 7)>>3)<<3;') + '''
return ret|0;
}
function stackSave() {