Index: tools/gn.py |
diff --git a/tools/gn.py b/tools/gn.py |
index 1504a6dfaca14cfa9072966c7b8c4e61c83808dc..96abe741ffac10405774e1d81dfe3cbf5f9fa844 100755 |
--- a/tools/gn.py |
+++ b/tools/gn.py |
@@ -74,22 +74,20 @@ def ToCommandLine(gn_args): |
return [merge(x, y) for x, y in gn_args.iteritems()] |
-def HostCpuForArch(arch): |
- if arch in ['ia32', 'arm', 'armv6', 'armv5te', 'mips', |
- 'simarm', 'simarmv6', 'simarmv5te', 'simmips', 'simdbc', |
+def host_cpu_for_arch(arch): |
+ if arch in ['ia32', 'arm', 'armv6', 'armv5te', |
+ 'simarm', 'simarmv6', 'simarmv5te', 'simdbc', |
'armsimdbc']: |
return 'x86' |
if arch in ['x64', 'arm64', 'simarm64', 'simdbc64', 'armsimdbc64']: |
return 'x64' |
-def TargetCpuForArch(arch, target_os): |
- if arch in ['ia32', 'simarm', 'simarmv6', 'simarmv5te', 'simmips']: |
+def target_cpu_for_arch(arch, target_os): |
+ if arch in ['ia32', 'simarm', 'simarmv6', 'simarmv5te']: |
return 'x86' |
if arch in ['simarm64']: |
return 'x64' |
- if arch == 'mips': |
- return 'mipsel' |
if arch == 'simdbc': |
return 'arm' if target_os == 'android' else 'x86' |
if arch == 'simdbc64': |
@@ -127,9 +125,7 @@ def DontUseClang(args, target_os, host_cpu, target_cpu): |
# We don't have clang on Windows. |
return (target_os == 'win' |
# TODO(zra): Experiment with using clang for the arm cross-builds. |
- or (target_os == 'linux' |
- and (target_cpu.startswith('arm') or |
- target_cpu.startswith('mips')) |
+ or (target_os == 'linux' and target_cpu.startswith('arm')) |
# TODO(zra): Only use clang when a sanitizer build is specified until |
# clang bugs in tcmalloc inline assembly for ia32 are fixed. |
or (target_os == 'linux' |
@@ -272,7 +268,7 @@ def ProcessOptions(args): |
return False |
for arch in args.arch: |
archs = ['ia32', 'x64', 'simarm', 'arm', 'simarmv6', 'armv6', |
- 'simarmv5te', 'armv5te', 'simmips', 'mips', 'simarm64', 'arm64', |
+ 'simarmv5te', 'armv5te', 'simarm64', 'arm64', |
'simdbc', 'simdbc64', 'armsimdbc', 'armsimdbc64'] |
if not arch in archs: |
print "Unknown arch %s" % arch |
@@ -290,7 +286,7 @@ def ProcessOptions(args): |
print ("Cross-compilation to %s is not supported on host os %s." |
% (os_name, HOST_OS)) |
return False |
- if not arch in ['ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', 'mips', |
+ if not arch in ['ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', |
'simdbc', 'simdbc64']: |
print ("Cross-compilation to %s is not supported for architecture %s." |
% (os_name, arch)) |
@@ -323,7 +319,7 @@ def parse_args(args): |
type=str, |
help='Target architectures (comma-separated).', |
metavar='[all,ia32,x64,simarm,arm,simarmv6,armv6,simarmv5te,armv5te,' |
- 'simmips,mips,simarm64,arm64,simdbc,armsimdbc]', |
+ 'simarm64,arm64,simdbc,armsimdbc]', |
default='x64') |
common_group.add_argument('--mode', '-m', |
type=str, |