Support MASM in MSBuild and Winja

pylib/gyp/generator/ninja.py

Index: pylib/gyp/generator/ninja.py
diff --git a/pylib/gyp/generator/ninja.py b/pylib/gyp/generator/ninja.py
index 6d0a102db7534075bb61c571de17825bf05d04fd..88d5986183ef627199a8842bea2aa5500d831603 100644
--- a/pylib/gyp/generator/ninja.py
+++ b/pylib/gyp/generator/ninja.py
@@ -787,10 +787,8 @@ class NinjaWriter:
         command = 'cc'
       elif ext == 's' and self.flavor != 'win':  # Doesn't generate .o.d files.
         command = 'cc_s'
-      elif (self.flavor == 'win' and ext == 'asm' and
-            self.msvs_settings.GetArch(config_name) == 'x86' and
-            not self.msvs_settings.HasExplicitAsmRules(spec)):
-        # Asm files only get auto assembled for x86 (not x64).
+      elif (self.flavor == 'win' and ext == 'asm' and not
+            self.msvs_settings.HasExplicitAsmRules(spec)):
         command = 'asm'
         # Add the _asm suffix as msvs is capable of handling .cc and
         # .asm files of the same name without collision.
@@ -1504,7 +1502,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
       'asm',
       description='ASM $in',
       command=('%s gyp-win-tool asm-wrapper '
-               '$arch $asm $defines $includes /c /Fo $out $in' %
+               '$arch $defines $includes /c /Fo $out $in' %
                sys.executable))
 
   if flavor != 'mac' and flavor != 'win':