unify registerize and minify passes, since they must run in conjunction

2 files changed, 3 insertions, 3 deletions

diff --git a/emcc b/emcc
index d90d63ed..8368f3b1 100755
--- a/emcc
+++ b/emcc
@@ -1553,7 +1553,7 @@ try:
     js_optimizer_queue += ['registerize']
 
   if opt_level > 0:
-    if debug_level < 2 and shared.Settings.ASM_JS and shared.Settings.RELOOP: js_optimizer_queue += ['minifyGlobals']
+    if debug_level < 2 and shared.Settings.ASM_JS: js_optimizer_queue = map(lambda p: p if p != 'registerize' else 'registerizeAndMinify', js_optimizer_queue)
     if debug_level == 0: js_optimizer_queue += ['minifyWhitespace']
 
   if closure and shared.Settings.ASM_JS: 
diff --git a/tools/js_optimizer.py b/tools/js_optimizer.py
index ca7f5364..9dd3bff5 100644
--- a/tools/js_optimizer.py
+++ b/tools/js_optimizer.py
@@ -130,9 +130,9 @@ def run_on_js(filename, passes, js_engine, jcache):
   end_funcs = js.rfind(end_funcs_marker)
   #assert (start_funcs >= 0) == (end_funcs >= 0) == (not not suffix)
 
-  minify_globals = 'minifyGlobals' in passes and 'asm' in passes
+  minify_globals = 'registerizeAndMinify' in passes and 'asm' in passes
   if minify_globals:
-    passes = filter(lambda p: p != 'minifyGlobals', passes) # we will run it manually
+    passes = map(lambda p: p if p != 'registerizeAndMinify' else 'registerize', passes)
     start_asm_marker = '// EMSCRIPTEN_START_ASM\n'
     end_asm_marker = '// EMSCRIPTEN_END_ASM\n'
     start_asm = js.find(start_asm_marker)