Switch to BoringSSL.

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
 
 
 # OS_ARCH_COMBOS maps from OS and platform to the OpenSSL assembly "style" for
 # that platform and the extension used by asm files.
 OS_ARCH_COMBOS = [
-    ('linux', 'arm', 'elf', 'S'),
-    ('linux', 'x86', 'elf', 'S'),
-    ('linux', 'x86_64', 'elf', 'S'),
-    ('mac', 'x86', 'macosx', 'S'),
-    ('mac', 'x86_64', 'macosx', 'S'),
-    ('win', 'x86_64', 'masm', 'asm'),
+    ('linux', 'arm', 'elf', [''], 'S'),
+    ('linux', 'x86', 'elf', ['-fPIC'], 'S'),
+    ('linux', 'x86_64', 'elf', [''], 'S'),
+    ('mac', 'x86', 'macosx', ['-fPIC'], 'S'),
+    ('mac', 'x86_64', 'macosx', [''], 'S'),
+    ('win', 'x86_64', 'masm', [''], 'asm'),
 ]
 
 # NON_PERL_FILES enumerates assembly files that are not processed by the
 # perlasm system.
 NON_PERL_FILES = {
     ('linux', 'arm'): [
         'src/crypto/poly1305/poly1305_arm_asm.S',
         'src/crypto/chacha/chacha_vec_arm.S',
     ],
 }
@@ skipping 113 matching lines @@
   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
+    (osname, arch, perlasm_style, extra_args, 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)
 
       if arch == ArchForAsmFilename(filename):
-        PerlAsm(output, perlasm['input'], perlasm_style, perlasm['extra_args'])
+        PerlAsm(output, perlasm['input'], perlasm_style,
+                perlasm['extra_args'] + 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):
   out.write('    \'%s\': [\n' % name)
@@ skipping 20 matching lines @@
                            (osname, arch), asm_files)
 
     gypi.write('  }\n}\n')
 
   test_c_files = FindCFiles(os.path.join('src', 'crypto'), OnlyTests)
 
   with open('boringssl_tests.gypi', 'w+') as test_gypi:
     test_gypi.write(FILE_HEADER + '{\n  \'targets\': [\n')
 
     test_names = []
-    for test in test_c_files:
+    for test in sorted(test_c_files):
       test_name = 'boringssl_%s' % os.path.splitext(os.path.basename(test))[0]
       test_gypi.write("""    {
       'target_name': '%s',
       'type': 'executable',
       'dependencies': [
         'boringssl',
       ],
       'sources': [
         '%s',
       ],
     },\n""" % (test_name, test))
       test_names.append(test_name)
 
     test_names.sort()
 
     test_gypi.write("""  ],
   'variables': {
     'boringssl_test_targets': [\n""")
 
     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())