Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(257)

Side by Side Diff: pnacl/driver/driver_tools.py

Issue 12256013: [MIPS] Fix missing definitions for MIPS arch in build and driver scripts (Closed) Base URL: http://git.chromium.org/native_client/src/native_client.git@master
Patch Set: Update per code review. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « pnacl/driver/driver_env.py ('k') | pnacl/driver/pnacl-driver.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # 5 #
6 # IMPORTANT NOTE: If you make local mods to this file, you must run: 6 # IMPORTANT NOTE: If you make local mods to this file, you must run:
7 # % pnacl/build.sh driver 7 # % pnacl/build.sh driver
8 # in order for them to take effect in the scons build. This command 8 # in order for them to take effect in the scons build. This command
9 # updates the copy in the toolchain/ tree. 9 # updates the copy in the toolchain/ tree.
10 # 10 #
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 # 219 #
220 ###################################################################### 220 ######################################################################
221 221
222 DriverArgPatterns = [ 222 DriverArgPatterns = [
223 ( '--pnacl-driver-verbose', "env.set('LOG_VERBOSE', '1')"), 223 ( '--pnacl-driver-verbose', "env.set('LOG_VERBOSE', '1')"),
224 ( ('-arch', '(.+)'), "SetArch($0)"), 224 ( ('-arch', '(.+)'), "SetArch($0)"),
225 ( '--pnacl-sb', "env.set('SANDBOXED', '1')"), 225 ( '--pnacl-sb', "env.set('SANDBOXED', '1')"),
226 ( '--pnacl-use-emulator', "env.set('USE_EMULATOR', '1')"), 226 ( '--pnacl-use-emulator', "env.set('USE_EMULATOR', '1')"),
227 ( '--dry-run', "env.set('DRY_RUN', '1')"), 227 ( '--dry-run', "env.set('DRY_RUN', '1')"),
228 ( '--pnacl-arm-bias', "env.set('BIAS', 'ARM')"), 228 ( '--pnacl-arm-bias', "env.set('BIAS', 'ARM')"),
229 ( '--pnacl-mips-bias', "env.set('BIAS', 'MIPS32')"),
229 ( '--pnacl-i686-bias', "env.set('BIAS', 'X8632')"), 230 ( '--pnacl-i686-bias', "env.set('BIAS', 'X8632')"),
230 ( '--pnacl-x86_64-bias', "env.set('BIAS', 'X8664')"), 231 ( '--pnacl-x86_64-bias', "env.set('BIAS', 'X8664')"),
231 ( '--pnacl-bias=(.+)', "env.set('BIAS', FixArch($0))"), 232 ( '--pnacl-bias=(.+)', "env.set('BIAS', FixArch($0))"),
232 ( '--pnacl-default-command-line', "env.set('USE_DEFAULT_CMD_LINE', '1')"), 233 ( '--pnacl-default-command-line', "env.set('USE_DEFAULT_CMD_LINE', '1')"),
233 ( '-save-temps', "env.set('SAVE_TEMPS', '1')"), 234 ( '-save-temps', "env.set('SAVE_TEMPS', '1')"),
234 ( '-no-save-temps', "env.set('SAVE_TEMPS', '0')"), 235 ( '-no-save-temps', "env.set('SAVE_TEMPS', '0')"),
235 ] 236 ]
236 237
237 DriverArgPatternsNotInherited = [ 238 DriverArgPatternsNotInherited = [
238 ( '--pnacl-driver-set-([^=]+)=(.*)', "env.set($0, $1)"), 239 ( '--pnacl-driver-set-([^=]+)=(.*)', "env.set($0, $1)"),
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 'x86_64': 'X8664', 941 'x86_64': 'X8664',
941 'x86-64': 'X8664', 942 'x86-64': 'X8664',
942 'x8664' : 'X8664', 943 'x8664' : 'X8664',
943 944
944 'arm' : 'ARM', 945 'arm' : 'ARM',
945 'armv7' : 'ARM', 946 'armv7' : 'ARM',
946 'arm-thumb2' : 'ARM', 947 'arm-thumb2' : 'ARM',
947 948
948 'mips32': 'MIPS32', 949 'mips32': 'MIPS32',
949 'mips' : 'MIPS32', 950 'mips' : 'MIPS32',
951 'mipsel': 'MIPS32',
950 } 952 }
951 if arch not in archfix: 953 if arch not in archfix:
952 Log.Fatal('Unrecognized arch "%s"!', arch) 954 Log.Fatal('Unrecognized arch "%s"!', arch)
953 return archfix[arch] 955 return archfix[arch]
954 956
955 def IsWindowsPython(): 957 def IsWindowsPython():
956 return 'windows' in platform.system().lower() 958 return 'windows' in platform.system().lower()
957 959
958 def SetupCygwinLibs(): 960 def SetupCygwinLibs():
959 bindir = env.getone('DRIVER_BIN') 961 bindir = env.getone('DRIVER_BIN')
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 # Last step 1109 # Last step
1108 step_output = self.output 1110 step_output = self.output
1109 else: 1111 else:
1110 # Intermediate step 1112 # Intermediate step
1111 if self.use_names_for_input: 1113 if self.use_names_for_input:
1112 step_output = self.namegen.TempNameForInput(self.input, output_type) 1114 step_output = self.namegen.TempNameForInput(self.input, output_type)
1113 else: 1115 else:
1114 step_output = self.namegen.TempNameForOutput(output_type) 1116 step_output = self.namegen.TempNameForOutput(output_type)
1115 callback(step_input, step_output, **extra) 1117 callback(step_input, step_output, **extra)
1116 step_input = step_output 1118 step_input = step_output
OLDNEW
« no previous file with comments | « pnacl/driver/driver_env.py ('k') | pnacl/driver/pnacl-driver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698