Support MASM in MSBuild and Winja

pylib/gyp/win_tool.py

 #!/usr/bin/env python
 
 # Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility functions for Windows builds.
 
 These functions are executed via gyp-win-tool when using the ninja generator.
 """
@@ skipping 130 matching lines @@
     # Processing C:\Program Files (x86)\Microsoft SDKs\...\include\objidl.idl
     # objidl.idl
     lines = out.splitlines()
     prefix = 'Processing '
     processing = set(os.path.basename(x) for x in lines if x.startswith(prefix))
     for line in lines:
       if not line.startswith(prefix) and line not in processing:
         print line
     return popen.returncode
 
-  def ExecAsmWrapper(self, arch, *args):
+  def ExecAsmWrapper(self, arch, *flags):
     """Filter logo banner from invocations of asm.exe."""
     env = self._GetEnv(arch)
-    # MSVS doesn't assemble x64 asm files.
-    if arch == 'environment.x64':
+    if arch == 'environment.x86':
+      args = ['ml', '/nologo'] + list(flags)
+    elif arch == 'environment.x64':
+      args = ['ml64', '/nologo'] + list(flags)
+    else:
       return 0
     popen = subprocess.Popen(args, shell=True, env=env,
                              stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
     out, _ = popen.communicate()
     for line in out.splitlines():
       if (not line.startswith('Copyright (C) Microsoft Corporation') and
           not line.startswith('Microsoft (R) Macro Assembler') and
           not line.startswith(' Assembling: ') and
           line):
         print line
@@ skipping 18 matching lines @@
     for |arch|. If |dir| is supplied, use that as the working directory."""
     env = self._GetEnv(arch)
     args = open(rspfile).read()
     dir = dir[0] if dir else None
     popen = subprocess.Popen(args, shell=True, env=env, cwd=dir)
     popen.wait()
     return popen.returncode
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))