Chromium Code Reviews| Index: ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py |
| diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py |
| index 3d35b3f8fbdfedaec21585f80e1c716db66bd3a1..e3d7e542d557e4bb820b348cafddbe496e8db715 100755 |
| --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py |
| +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_component_crx_gen.py |
| @@ -38,6 +38,8 @@ def CanonicalArch(arch): |
| # 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
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 |
| @@ -47,7 +49,7 @@ def GetBuildArch(): |
| 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 |
| @@ -56,7 +58,8 @@ def IsValidArch(arch): |
| def StandardArch(arch): |
| return {'x86-32': 'i686', |
| 'x86-64': 'x86_64', |
| - 'arm' : 'armv7'}[arch] |
| + 'arm' : 'armv7', |
| + 'mips' : 'mips'}[arch] |
| ###################################################################### |
| @@ -186,6 +189,9 @@ class PnaclDirs(object): |
| @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
petarj
2014/02/06 00:38:48
PNaCl uses mips32 to refer to 32bit MIPS LE. This
|
| return J(PnaclDirs.TranslatorRoot(), 'lib-%s' % target_arch) |
| @staticmethod |