Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- 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 import platform | 6 import platform |
| 7 import os | 7 import os |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 else: | 220 else: |
| 221 raise Exception("Unsupported target") | 221 raise Exception("Unsupported target") |
| 222 | 222 |
| 223 if env.Bit('linux'): | 223 if env.Bit('linux'): |
| 224 ldr_inputs += [ | 224 ldr_inputs += [ |
| 225 'posix/nacl_signal.c', | 225 'posix/nacl_signal.c', |
| 226 'posix/sel_addrspace_posix.c' | 226 'posix/sel_addrspace_posix.c' |
| 227 ] | 227 ] |
| 228 if env.Bit('target_arm'): | 228 if env.Bit('target_arm'): |
| 229 ldr_inputs += ['linux/nacl_signal_arm.c'] | 229 ldr_inputs += ['linux/nacl_signal_arm.c'] |
| 230 elif env.Bit('target_mips32'): | |
| 231 ldr_inputs += ['linux/nacl_signal_mips.c'] | |
|
Brad Chen
2012/04/13 00:50:52
This file is not in the repo, right? Is there a re
| |
| 230 elif env.Bit('target_x86_32'): | 232 elif env.Bit('target_x86_32'): |
| 231 ldr_inputs += ['linux/nacl_signal_32.c'] | 233 ldr_inputs += ['linux/nacl_signal_32.c'] |
| 232 elif env.Bit('target_x86_64'): | 234 elif env.Bit('target_x86_64'): |
| 233 ldr_inputs += ['linux/nacl_signal_64.c'] | 235 ldr_inputs += ['linux/nacl_signal_64.c'] |
| 234 else: | 236 else: |
| 235 raise Exception("Unsupported target") | 237 raise Exception("Unsupported target") |
| 236 | 238 |
| 237 if env.Bit('mac'): | 239 if env.Bit('mac'): |
| 238 ldr_inputs += [ | 240 ldr_inputs += [ |
| 239 'posix/nacl_signal.c', | 241 'posix/nacl_signal.c', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 285 # it is available in Windows DDK only. The DDK is not | 287 # it is available in Windows DDK only. The DDK is not |
| 286 # in third_party, but we might need to add it if we want to use it. | 288 # in third_party, but we might need to add it if we want to use it. |
| 287 # 'ntdll', | 289 # 'ntdll', |
| 288 ], | 290 ], |
| 289 ) | 291 ) |
| 290 | 292 |
| 291 if env.Bit('target_x86'): | 293 if env.Bit('target_x86'): |
| 292 VALIDATOR_LIB = env.NaClTargetArchSuffix('ncvalidate') | 294 VALIDATOR_LIB = env.NaClTargetArchSuffix('ncvalidate') |
| 293 elif env.Bit('target_arm'): | 295 elif env.Bit('target_arm'): |
| 294 VALIDATOR_LIB = 'ncvalidate_arm_v2' | 296 VALIDATOR_LIB = 'ncvalidate_arm_v2' |
| 297 elif env.Bit('target_mips32'): | |
| 298 VALIDATOR_LIB = 'ncvalidate_mips' | |
|
Brad Chen
2012/04/13 00:50:52
Ditto; I'm wondering if this is premature.
| |
| 295 else: | 299 else: |
| 296 # Unknown architecture | 300 # Unknown architecture |
| 297 raise AssertionError('Unknown architecture') | 301 raise AssertionError('Unknown architecture') |
| 298 | 302 |
| 299 r_debug_objs = [] | 303 r_debug_objs = [] |
| 300 if env.Bit('linux'): | 304 if env.Bit('linux'): |
| 301 r_debug_objs += [env.ComponentObject('linux/r_debug.c')] | 305 r_debug_objs += [env.ComponentObject('linux/r_debug.c')] |
| 302 | 306 |
| 303 sel_ldr_libs = ['sel', | 307 sel_ldr_libs = ['sel', |
| 304 'env_cleanser', | 308 'env_cleanser', |
| (...skipping 646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 951 # TODO(tuduce): Make it work on windows. | 955 # TODO(tuduce): Make it work on windows. |
| 952 env.AddNodeToTestSuite(node, ['medium_tests'], | 956 env.AddNodeToTestSuite(node, ['medium_tests'], |
| 953 'run_sel_ldr_thread_death_test', | 957 'run_sel_ldr_thread_death_test', |
| 954 is_broken=env.Bit('windows')) | 958 is_broken=env.Bit('windows')) |
| 955 | 959 |
| 956 | 960 |
| 957 # This currently tests linking of sel_main_chrome.c *only*. We do not | 961 # This currently tests linking of sel_main_chrome.c *only*. We do not |
| 958 # expect this program to do anything meaningful when run. | 962 # expect this program to do anything meaningful when run. |
| 959 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], | 963 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], |
| 960 EXTRA_LIBS=sel_ldr_libs) | 964 EXTRA_LIBS=sel_ldr_libs) |
| OLD | NEW |