PNaCl. Enables x32 libraries for non-sfi runtime.

toolchain_build/toolchain_build_pnacl.py

 #!/usr/bin/python
 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Recipes for PNaCl toolchain packages.
 
    Recipes consist of specially-structured dictionaries, with keys for package
    name, type, commands to execute, etc. The structure is documented in the
    PackageBuilder docstring in toolchain_main.py.
@@ skipping 1190 matching lines @@
     if os_name != 'win':
       host_packages[os_name].append('libcxx_%s' % legal_triple)
 
   # Unsandboxed target IRT libraries
   for os_name in ['linux', 'mac']:
     legal_triple = pynacl.gsd_storage.LegalizeName('x86-32-' + os_name)
     host_packages[os_name].append('unsandboxed_runtime_%s' % legal_triple)
   for os_name in ['linux']:
     legal_triple = pynacl.gsd_storage.LegalizeName('arm-' + os_name)
     host_packages[os_name].append('unsandboxed_runtime_%s' % legal_triple)
+  for os_name in ['linux']:
+    legal_triple = pynacl.gsd_storage.LegalizeName('x86-64-' + os_name)
+    host_packages[os_name].append('unsandboxed_runtime_%s' % legal_triple)
 
   for os_name, os_packages in host_packages.iteritems():
     package_target = '%s_x86' % pynacl.platform.GetOS(os_name)
     package_targets[package_target] = {}
 
     raw_packages = os_packages + common_raw_packages
     package_targets[package_target]['pnacl_newlib_raw'] = raw_packages
 
     complete_packages = raw_packages + common_complete_packages
     package_targets[package_target]['pnacl_newlib'] = complete_packages
@@ skipping 115 matching lines @@
     packages.update(Metadata(rev, is_canonical))
     packages.update(pnacl_targetlibs.SDKCompiler(
                     ['le32'] + DIRECT_TO_NACL_ARCHES))
     packages.update(pnacl_targetlibs.SDKLibs('le32', is_canonical))
     unsandboxed_runtime_canonical = is_canonical or pynacl.platform.IsMac()
     packages.update(pnacl_targetlibs.UnsandboxedRuntime(
         'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_runtime_canonical))
     if pynacl.platform.IsLinux():
       packages.update(pnacl_targetlibs.UnsandboxedRuntime(
           'arm-%s' % pynacl.platform.GetOS(), unsandboxed_runtime_canonical))
+      packages.update(pnacl_targetlibs.UnsandboxedRuntime(
+          'x86-64-%s' % pynacl.platform.GetOS(), unsandboxed_runtime_canonical))
 
   if args.build_sbtc and not args.pnacl_in_pnacl:
     packages.update(pnacl_sandboxed_translator.SandboxedTranslators(
       SANDBOXED_TRANSLATOR_ARCHES))
 
   tb = toolchain_main.PackageBuilder(packages,
                                      upload_packages,
                                      leftover_args)
   return tb.Main()
 
 
 if __name__ == '__main__':
   sys.exit(main())