reflect that asm is on by default in fastcomp, even in -O0, in the settings

2 files changed, 3 insertions, 1 deletions

diff --git a/src/settings.js b/src/settings.js
index c8114059..1c6b998e 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -446,7 +446,7 @@ var HEADLESS = 0; // If 1, will include shim code that tries to 'fake' a browser
 var BENCHMARK = 0; // If 1, will just time how long main() takes to execute, and not
                    // print out anything at all whatsoever. This is useful for benchmarking.
 
-var ASM_JS = 0; // If 1, generate code in asm.js format. If 2, emits the same code except
+var ASM_JS = 1; // If 1, generate code in asm.js format. If 2, emits the same code except
                 // for omitting 'use asm'
 
 var PGO = 0; // Enables profile-guided optimization in the form of runtime checks for
diff --git a/tools/shared.py b/tools/shared.py
index 31dc64b1..6d4636cf 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -804,6 +804,8 @@ class Settings2(type):
 
     @classmethod
     def apply_opt_level(self, opt_level, noisy=False):
+      if opt_level == 0 and os.environ.get('EMCC_FAST_COMPILER') == '0':
+        self.attrs['ASM_JS'] = 0 # non-fastcomp has asm off in -O1
       if opt_level >= 1:
         self.attrs['ASM_JS'] = 1
         self.attrs['ASSERTIONS'] = 0