| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium 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 'includes': [ | 6 'includes': [ |
| 7 '../../build/common_untrusted.gypi', | 7 '../../build/common_untrusted.gypi', |
| 8 ], | 8 ], |
| 9 'conditions': [ | 9 'conditions': [ |
| 10 ['disable_nacl==0 and disable_nacl_untrusted==0', { | 10 ['disable_nacl==0 and disable_nacl_untrusted==0', { |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 # TODO(olonho): simplify flags handling and avoid duplication | 264 # TODO(olonho): simplify flags handling and avoid duplication |
| 265 # with NaCl logic. | 265 # with NaCl logic. |
| 266 'conditions': [ | 266 'conditions': [ |
| 267 ['target_arch!="arm"', | 267 ['target_arch!="arm"', |
| 268 { | 268 { |
| 269 'link_flags': [ | 269 'link_flags': [ |
| 270 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', | 270 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
| 271 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', | 271 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', |
| 272 ] | 272 ] |
| 273 }, { # target_arch == "arm" | 273 }, { # target_arch == "arm" |
| 274 # TODO(mcgrathr): This knowledge really belongs in |
| 275 # native_client/src/untrusted/irt/irt.gyp instead of here. |
| 276 # But that builds libirt_browser.a as bitcode, so a native |
| 277 # object does not fit happily there. |
| 278 'sources': [ |
| 279 '../../native_client/src/untrusted/irt/aeabi_read_tp.S', |
| 280 ], |
| 274 'link_flags': [ | 281 'link_flags': [ |
| 275 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', | 282 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
| 276 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', | 283 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', |
| 277 '--pnacl-allow-native', | 284 '--pnacl-allow-native', |
| 278 '-arch', 'arm', | 285 '-arch', 'arm', |
| 279 '-Wt,-mtls-use-call', | 286 '-Wt,-mtls-use-call', |
| 280 ], | 287 ], |
| 281 }, | 288 }, |
| 282 ], | 289 ], |
| 283 ], | 290 ], |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', | 446 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', |
| 440 '../../native_client/src/shared/platform/platform.gyp:platform_lib', | 447 '../../native_client/src/shared/platform/platform.gyp:platform_lib', |
| 441 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', | 448 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', |
| 442 '../../native_client/src/shared/gio/gio.gyp:gio_lib', | 449 '../../native_client/src/shared/gio/gio.gyp:gio_lib', |
| 443 ], | 450 ], |
| 444 }, | 451 }, |
| 445 ], | 452 ], |
| 446 }], | 453 }], |
| 447 ], | 454 ], |
| 448 } | 455 } |
| OLD | NEW |