net: pickup "586" asm files for x86.

BUG=392745
R=rsleevi@chromium.org

Review URL: https://codereview.chromium.org/385983006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282698 0039d316-1c4b-4281-b951-d872f2087c98

third_party/boringssl/boringssl.gyp

@@ -28,7 +28,7 @@
             ['OS == "linux" or OS == "android"', {
               'sources': [ '<@(boringssl_linux_x86_sources)' ],
             }],
-            ['OS != "mac" and OS != "linux"', {
+            ['OS != "mac" and OS != "linux" and OS != "android"', {
               'defines': [ 'OPENSSL_NO_ASM' ],
             }],
           ]
@@ -44,12 +44,12 @@
             ['OS == "win"', {
               'sources': [ '<@(boringssl_win_x86_64_sources)' ],
             }],
-            ['OS != "mac" and OS != "linux" and OS != "win"', {
+            ['OS != "mac" and OS != "linux" and OS != "win" and OS != "android"', {
               'defines': [ 'OPENSSL_NO_ASM' ],
             }],
           ]
         }],
-        ['target_arch != "arm" and target_arch != "x86" and target_arch != "x64"', {
+        ['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64"', {
           'defines': [ 'OPENSSL_NO_ASM' ],
         }],
       ],

third_party/boringssl/boringssl.gypi

-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -325,11 +325,19 @@
       'src/crypto/poly1305/poly1305_arm_asm.S',
     ],
     'boringssl_linux_x86_sources': [
+      'linux-x86/crypto/aes/aes-586.S',
       'linux-x86/crypto/aes/aesni-x86.S',
       'linux-x86/crypto/aes/vpaes-x86.S',
+      'linux-x86/crypto/bn/bn-586.S',
+      'linux-x86/crypto/bn/co-586.S',
       'linux-x86/crypto/bn/x86-mont.S',
       'linux-x86/crypto/cpu-x86-asm.S',
+      'linux-x86/crypto/md5/md5-586.S',
       'linux-x86/crypto/modes/ghash-x86.S',
+      'linux-x86/crypto/rc4/rc4-586.S',
+      'linux-x86/crypto/sha/sha1-586.S',
+      'linux-x86/crypto/sha/sha256-586.S',
+      'linux-x86/crypto/sha/sha512-586.S',
     ],
     'boringssl_linux_x86_64_sources': [
       'linux-x86_64/crypto/aes/aes-x86_64.S',
@@ -352,11 +360,19 @@
       'linux-x86_64/crypto/sha/sha512-x86_64.S',
     ],
     'boringssl_mac_x86_sources': [
+      'mac-x86/crypto/aes/aes-586.S',
       'mac-x86/crypto/aes/aesni-x86.S',
       'mac-x86/crypto/aes/vpaes-x86.S',
+      'mac-x86/crypto/bn/bn-586.S',
+      'mac-x86/crypto/bn/co-586.S',
       'mac-x86/crypto/bn/x86-mont.S',
       'mac-x86/crypto/cpu-x86-asm.S',
+      'mac-x86/crypto/md5/md5-586.S',
       'mac-x86/crypto/modes/ghash-x86.S',
+      'mac-x86/crypto/rc4/rc4-586.S',
+      'mac-x86/crypto/sha/sha1-586.S',
+      'mac-x86/crypto/sha/sha256-586.S',
+      'mac-x86/crypto/sha/sha512-586.S',
     ],
     'boringssl_mac_x86_64_sources': [
       'mac-x86_64/crypto/aes/aes-x86_64.S',

third_party/boringssl/boringssl_tests.gypi

-# Copyright 2014 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 

third_party/boringssl/update_gypi_and_asm.py

@@ -132,6 +132,20 @@ def PerlAsm(output_filename, input_filename, perlasm_style, extra_args):
     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."""
@@ -150,15 +164,7 @@ def WriteAsmFiles(perlasms):
       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)