| 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.gypi', | 7 '../../../build/common.gypi', |
| 8 ], | 8 ], |
| 9 'variables': { | 9 'variables': { |
| 10 'irt_sources': [ | 10 'irt_sources': [ |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 ], | 39 ], |
| 40 'irt_browser': [ | 40 'irt_browser': [ |
| 41 'irt_interfaces_ppapi.c', | 41 'irt_interfaces_ppapi.c', |
| 42 'irt_entry_ppapi.c', | 42 'irt_entry_ppapi.c', |
| 43 'irt_ppapi.c', | 43 'irt_ppapi.c', |
| 44 'irt_manifest.c', | 44 'irt_manifest.c', |
| 45 'irt_nameservice.c', | 45 'irt_nameservice.c', |
| 46 'irt_random.c', | 46 'irt_random.c', |
| 47 ], | 47 ], |
| 48 }, | 48 }, |
| 49 'conditions': [ | 49 'targets': [ |
| 50 # NOTE: We do not support untrusted gyp build on arm yet. | 50 { |
| 51 ['target_arch!="arm"', { | 51 'target_name': 'irt_core_nexe', |
| 52 'targets': [ | 52 'type': 'none', |
| 53 { | 53 'variables': { |
| 54 'target_name': 'irt_core_nexe', | 54 'nexe_target': 'irt_core', |
| 55 'type': 'none', | 55 'build_glibc': 0, |
| 56 'variables': { | 56 'build_newlib': 1, |
| 57 'nexe_target': 'irt_core', | 57 'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'], |
| 58 'build_glibc': 0, | 58 'conditions': [ |
| 59 'build_newlib': 1, | 59 # See comment in native_client/src/untrusted/irt/nacl.scons |
| 60 'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'], | 60 # regarding -Ttext-segment. Also see |
| 61 'link_flags': [ | 61 # http://code.google.com/p/nativeclient/issues/detail?id=2691. |
| 62 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', | 62 ['target_arch!="arm"', |
| 63 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', | 63 { |
| 64 ], | 64 'link_flags': [ |
| 65 }, | 65 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
| 66 'dependencies': [ | 66 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', |
| 67 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | 67 ] |
| 68 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib'
, | 68 }, { # target_arch == "arm" |
| 69 ], | 69 'sources': ['<@(irt_sources)', |
| 70 }, | 70 'aeabi_read_tp.S'], |
| 71 { | 71 'cflags': ['--pnacl-allow-translate', |
| 72 'target_name': 'irt_browser_lib', | 72 '-arch', 'arm'], |
| 73 'type': 'none', | 73 'asflags': ['-arch', 'arm'], |
| 74 'variables': { | 74 'link_flags': [ |
| 75 'nlib_target': 'libirt_browser.a', | 75 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', |
| 76 'build_glibc': 0, | 76 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', |
| 77 'build_newlib': 1, | 77 '--pnacl-allow-native', |
| 78 'sources': ['<@(irt_sources)', '<@(irt_browser)'], | 78 '-arch', 'arm', |
| 79 }, | 79 '-Wt,-mtls-use-call', |
| 80 'conditions': [ | 80 # TODO(olonho): rethink |
| 81 ['target_arch == "x64" or target_arch == "ia32"', { | 81 '-L<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm', |
| 82 'variables': { | 82 ], |
| 83 'link_flags': [ | 83 }, |
| 84 '-r', | 84 ], |
| 85 '-nostartfiles', | 85 ], |
| 86 ], | 86 }, |
| 87 }, | 87 'dependencies': [ |
| 88 }], | 88 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 89 ], | 89 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', |
| 90 'dependencies': [ | |
| 91 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', | |
| 92 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib'
, | |
| 93 ], | |
| 94 }, | |
| 95 ], | 90 ], |
| 96 }], | 91 }, |
| 92 { |
| 93 'target_name': 'irt_browser_lib', |
| 94 'type': 'none', |
| 95 'variables': { |
| 96 'nlib_target': 'libirt_browser.a', |
| 97 'build_glibc': 0, |
| 98 'build_newlib': 1, |
| 99 'sources': ['<@(irt_sources)', '<@(irt_browser)'], |
| 100 'link_flags': [ |
| 101 '-r', |
| 102 '-nostartfiles', |
| 103 ], |
| 104 }, |
| 105 'dependencies': [ |
| 106 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |
| 107 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', |
| 108 ], |
| 109 }, |
| 97 ], | 110 ], |
| 98 } | 111 } |
| OLD | NEW |