Chromium Code Reviews Chromium Code Reviews
Issue 10832040:
Support 64-bit reserved_at_zero value nacl-side (Closed)
Base URL: http://git.chromium.org/native_client/src/native_client.git@master| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # | 5 # |
| 6 # Config file for various nacl compilation scenarios | 6 # Config file for various nacl compilation scenarios |
| 7 # | 7 # |
| 8 import os | 8 import os |
| 9 import sys | 9 import sys |
| 10 | 10 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 52 | 52 |
| 53 | 53 |
| 54 ###################################################################### | 54 ###################################################################### |
| 55 # | 55 # |
| 56 ###################################################################### | 56 ###################################################################### |
| 57 | 57 |
| 58 LOCAL_GCC = '/usr/bin/gcc' | 58 LOCAL_GCC = '/usr/bin/gcc' |
| 59 | 59 |
| 60 EMU_SCRIPT = 'toolchain/linux_arm-trusted/run_under_qemu_arm' | 60 EMU_SCRIPT = 'toolchain/linux_arm-trusted/run_under_qemu_arm' |
| 61 | 61 |
| 62 BOOTSTRAP_ARGS = '--r_debug=0xXXXXXXXXXXXXXXXX --reserved_at_zero=0xXXXXXXXX' | 62 TEMPLATE_DIGITS = 'X'*16 |
|
Mark Seaborn
2012/07/30 18:51:12
Same nit about spaces
Austin Benson
2012/07/31 23:24:12
Done.
| |
| 63 BOOTSTRAP_ARGS = '--r_debug=0x%s --reserved_at_zero=0x%s' % (TEMPLATE_DIGITS, | |
| 64 TEMPLATE_DIGITS) | |
| 63 | 65 |
| 64 BOOTSTRAP_ARM = 'scons-out/opt-linux-arm/staging/nacl_helper_bootstrap' | 66 BOOTSTRAP_ARM = 'scons-out/opt-linux-arm/staging/nacl_helper_bootstrap' |
| 65 SEL_LDR_ARM = 'scons-out/opt-linux-arm/staging/sel_ldr' | 67 SEL_LDR_ARM = 'scons-out/opt-linux-arm/staging/sel_ldr' |
| 66 IRT_ARM = 'scons-out/nacl_irt-arm/obj/src/untrusted/irt/irt_core.nexe' | 68 IRT_ARM = 'scons-out/nacl_irt-arm/obj/src/untrusted/irt/irt_core.nexe' |
| 67 RUN_SEL_LDR_ARM = BOOTSTRAP_ARM + ' ' + SEL_LDR_ARM + ' ' + BOOTSTRAP_ARGS | 69 RUN_SEL_LDR_ARM = BOOTSTRAP_ARM + ' ' + SEL_LDR_ARM + ' ' + BOOTSTRAP_ARGS |
| 68 | 70 |
| 69 BOOTSTRAP_X32 = 'scons-out/opt-linux-x86-32/staging/nacl_helper_bootstrap' | 71 BOOTSTRAP_X32 = 'scons-out/opt-linux-x86-32/staging/nacl_helper_bootstrap' |
| 70 SEL_LDR_X32 = 'scons-out/opt-linux-x86-32/staging/sel_ldr' | 72 SEL_LDR_X32 = 'scons-out/opt-linux-x86-32/staging/sel_ldr' |
| 71 IRT_X32 = 'scons-out/nacl_irt-x86-32/obj/src/untrusted/irt/irt_core.nexe' | 73 IRT_X32 = 'scons-out/nacl_irt-x86-32/obj/src/untrusted/irt/irt_core.nexe' |
| 72 RUN_SEL_LDR_X32 = BOOTSTRAP_X32 + ' ' + SEL_LDR_X32 + ' ' + BOOTSTRAP_ARGS | 74 RUN_SEL_LDR_X32 = BOOTSTRAP_X32 + ' ' + SEL_LDR_X32 + ' ' + BOOTSTRAP_ARGS |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 339 desc='pnacl llvm [x8664]', | 341 desc='pnacl llvm [x8664]', |
| 340 attributes=['x86-64', 'O3'], | 342 attributes=['x86-64', 'O3'], |
| 341 commands=COMMANDS_llvm_pnacl_x86_O0, | 343 commands=COMMANDS_llvm_pnacl_x86_O0, |
| 342 tools_needed=[PNACL_FRONTEND, PNACL_LD, BOOTSTRAP_X64, SEL_LDR_X64], | 344 tools_needed=[PNACL_FRONTEND, PNACL_LD, BOOTSTRAP_X64, SEL_LDR_X64], |
| 343 CC = PNACL_FRONTEND, | 345 CC = PNACL_FRONTEND, |
| 344 LD = PNACL_LD + ' -arch x86-64', | 346 LD = PNACL_LD + ' -arch x86-64', |
| 345 SEL_LDR = RUN_SEL_LDR_X64, | 347 SEL_LDR = RUN_SEL_LDR_X64, |
| 346 IRT = IRT_X64, | 348 IRT = IRT_X64, |
| 347 CFLAGS = '-O3 -D__OPTIMIZE__ -static ' + CLANG_CFLAGS + ' ' | 349 CFLAGS = '-O3 -D__OPTIMIZE__ -static ' + CLANG_CFLAGS + ' ' |
| 348 + GLOBAL_CFLAGS) | 350 + GLOBAL_CFLAGS) |
| OLD | NEW |
