aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-05-25 10:15:36 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-05-25 10:15:36 -0700
commit39ea986557d18803c6ea60a65149a62b17f40f51 (patch)
tree7327dbc8f53298786c04171f93c13be4b114244c
parent70d8a4764d6983fdaaeb64bcec52515048194a09 (diff)
enable asm.js in embind, with extra reserved function pointers by default
-rwxr-xr-xemcc3
1 files changed, 1 insertions, 2 deletions
diff --git a/emcc b/emcc
index 9674c41c..65dec978 100755
--- a/emcc
+++ b/emcc
@@ -1002,8 +1002,7 @@ try:
assert opt_level >= 1, 'asm.js requires -O1 or above'
if bind:
- shared.Settings.ASM_JS = 0
- logging.warning('disabling asm.js because it is not compatible with embind yet')
+ shared.Settings.RESERVED_FUNCTION_POINTERS = max(shared.Settings.RESERVED_FUNCTION_POINTERS, 10)
if shared.Settings.CORRECT_SIGNS != 1:
logging.warning('setting CORRECT_SIGNS to 1 for asm.js code generation')
shared.Settings.CORRECT_SIGNS = 1