[MIPS] Support for MIPS PNaCl in PPAPI

ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """This script lays out the PNaCl translator files for a
    normal Chrome installer, for one platform.  Once run num-of-arches times,
    the result can then be packed into a multi-CRX zip file.
 
    This script depends on and pulls in the translator nexes and libraries
@@ skipping 20 matching lines @@
 # This is based on the machine "building" this extension.
 # We also used this to identify the arch-specific different versions of
 # this extension.
 
 def CanonicalArch(arch):
   if arch in ('x86_64', 'x86-64', 'x64', 'amd64'):
     return 'x86-64'
   # TODO(jvoung): be more specific about the arm architecture version?
   if arch in ('arm', 'armv7'):
     return 'arm'
+  if arch in ('mips', 'mipsel'):
+    return 'mips'

[jvoung (off chromium), 2014/02/06 00:39:56]

can you just make the canonical arch "mips32" put that in ARCHES=[...], then
will that fix the bit in the LibDir()?

[petarj, 2014/02/20 00:23:18]

Done.

   if re.match('^i.86$', arch) or arch in ('x86_32', 'x86-32', 'ia32', 'x86'):
     return 'x86-32'
   return None
 
 def GetBuildArch():
   arch = platform.machine()
   return CanonicalArch(arch)
 
 BUILD_ARCH = GetBuildArch()
-ARCHES = ['x86-32', 'x86-64', 'arm']
+ARCHES = ['x86-32', 'x86-64', 'arm', 'mips']
 
 def IsValidArch(arch):
   return arch in ARCHES
 
 # The version of the arch used by configure and pnacl's build.sh.
 def StandardArch(arch):
   return {'x86-32': 'i686',
           'x86-64': 'x86_64',
-          'arm'   : 'armv7'}[arch]
+          'arm'   : 'armv7',
+          'mips'  : 'mips'}[arch]
 
 
 ######################################################################
 
 def GetNaClRoot():
   """ Find the native_client path, relative to this script.
       This script is in ppapi/... and native_client is a sibling of ppapi.
   """
   script_file = os.path.abspath(__file__)
   def SearchForNaCl(cur_dir):
@@ skipping 109 matching lines @@
 class PnaclDirs(object):
   toolchain_dir = J(NACL_ROOT, 'toolchain')
   output_dir = J(toolchain_dir, 'pnacl-package')
 
   @staticmethod
   def TranslatorRoot():
     return J(PnaclDirs.toolchain_dir, 'pnacl_translator')
 
   @staticmethod
   def LibDir(target_arch):
+    # Libraries for MIPS are located in lib-mips32 directory.
+    if (target_arch == "mips"):
+      return J(PnaclDirs.TranslatorRoot(), 'lib-mips32')

[dmichael (off chromium), 2014/02/05 23:55:22]

I'm not very familiar with this code, but...  why can't the name of the
directory be made to match so you don't need this special case?

[petarj, 2014/02/06 00:38:48]

PNaCl uses mips32 to refer to 32bit MIPS LE. This is how the libraries end up in
lib-mips32.
We need a special case somewhere, having it here seemed least intrusive to the
current setup.

     return J(PnaclDirs.TranslatorRoot(), 'lib-%s' % target_arch)
 
   @staticmethod
   def SandboxedCompilerDir(target_arch):
     return J(PnaclDirs.toolchain_dir,
              'pnacl_translator', StandardArch(target_arch), 'bin')
 
   @staticmethod
   def SetOutputDir(d):
     PnaclDirs.output_dir = d
@@ skipping 173 matching lines @@
 
   abi_version = int(args[0])
 
   arches = DetermineInstallerArches(options.target_arch)
   BuildInstallerStyle(abi_version, lib_overrides, arches)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(Main())