test fixes and set sign and overflow correction to 1 when in asm mode

1 files changed, 11 insertions, 4 deletions

diff --git a/emcc b/emcc
index afe4f22b..27b873c4 100755
--- a/emcc
+++ b/emcc
@@ -851,13 +851,20 @@ try:
     exec('shared.Settings.' + key + ' = ' + value)
 
   # Apply effects from settings
+  if shared.Settings.ASM_JS:
+    if closure:
+      print >> sys.stderr, 'emcc: warning: disabling closure because it is not compatible with asm.js code generation'
+      closure = False
+    if shared.Settings.CORRECT_SIGNS != 1: 
+      print >> sys.stderr, 'emcc: warning: setting CORRECT_SIGNS to 1 for asm.js code generation'
+      shared.Settings.CORRECT_SIGNS = 1
+    if shared.Settings.CORRECT_OVERFLOWS != 1: 
+      print >> sys.stderr, 'emcc: warning: setting CORRECT_OVERFLOWS to 1 for asm.js code generation'
+      shared.Settings.CORRECT_OVERFLOWS = 1
+
   if shared.Settings.CORRECT_SIGNS >= 2 or shared.Settings.CORRECT_OVERFLOWS >= 2 or shared.Settings.CORRECT_ROUNDINGS >= 2:
     keep_debug = True # must keep debug info to do line-by-line operations 
 
-  if closure and shared.Settings.ASM_JS:
-    print >> sys.stderr, 'emcc: warning: disabling closure because it is not compatible with asm.js code generation'
-    closure = False
-
   if minify_whitespace is None:
     minify_whitespace = closure # if closure is run, minify whitespace