net: pickup "586" asm files for x86.

third_party/boringssl/update_gypi_and_asm.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can b
 # found in the LICENSE file.
 
 """Enumerates the BoringSSL source in src/ and generates two gypi files:
   boringssl.gypi and boringssl_tests.gypi."""
 
 import os
 import subprocess
 import sys
@@ skipping 114 matching lines @@
   """Runs the a perlasm script and puts the output into output_filename."""
   base_dir = os.path.dirname(output_filename)
   if not os.path.isdir(base_dir):
     os.makedirs(base_dir)
   output = subprocess.check_output(
       ['perl', input_filename, perlasm_style] + extra_args)
   with open(output_filename, 'w+') as out_file:
     out_file.write(output)
 
 
+def ArchForAsmFilename(filename):
+  """Returns the architecture that a given asm file should be compiled for
+  based on substrings in the filename."""
+
+  if 'x86_64' in filename or 'avx2' in filename:
+    return 'x86_64'
+  elif ('x86' in filename and 'x86_64' not in filename) or '586' in filename:
+    return 'x86'
+  elif 'arm' in filename:
+    return 'arm'
+  else:
+    raise ValueError('Unknown arch for asm filename: ' + filename)
+
+
 def WriteAsmFiles(perlasms):
   """Generates asm files from perlasm directives for each supported OS x
   platform combination."""
   asmfiles = {}
 
   for osarch in OS_ARCH_COMBOS:
     (osname, arch, perlasm_style, asm_ext) = osarch
     key = (osname, arch)
     outDir = '%s-%s' % key
 
     for perlasm in perlasms:
       filename = os.path.basename(perlasm['input'])
       output = perlasm['output']
       if not output.startswith('src'):
         raise ValueError('output missing src: %s' % output)
       output = os.path.join(outDir, output[4:])
       output = output.replace('${ASM_EXT}', asm_ext)
 
-      found = False
-      if arch == 'x86_64' and ('x86_64' in filename or 'avx2' in filename):
-        found = True
-      elif arch == 'x86' and 'x86' in filename and 'x86_64' not in filename:
-        found = True
-      elif arch == 'arm' and 'arm' in filename:
-        found = True
-
-      if found:
+      if arch == ArchForAsmFilename(filename):
         PerlAsm(output, perlasm['input'], perlasm_style, perlasm['extra_args'])
         asmfiles.setdefault(key, []).append(output)
 
   for (key, non_perl_asm_files) in NON_PERL_FILES.iteritems():
     asmfiles.setdefault(key, []).extend(non_perl_asm_files)
 
   return asmfiles
 
 
 def PrintVariableSection(out, name, files):
@@ skipping 51 matching lines @@
     for test in test_names:
       test_gypi.write("""      '%s',\n""" % test)
 
     test_gypi.write('    ],\n  }\n}\n')
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())