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

Side by Side Diff: src/untrusted/irt/irt.gyp

Issue 140653005: Adds tls_edit utility which patches irt_core.nexe's TLS usage. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Rebased to master Created 6 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 | Annotate | Revision Log
« no previous file with comments | « src/trusted/validator_ragel/rdfa_validator.gyp ('k') | src/untrusted/irt/nacl.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'irt_core_resource.c', 45 'irt_core_resource.c',
46 ], 46 ],
47 'irt_browser': [ 47 'irt_browser': [
48 'irt_interfaces_ppapi.c', 48 'irt_interfaces_ppapi.c',
49 'irt_ppapi.c', 49 'irt_ppapi.c',
50 'irt_manifest.c', 50 'irt_manifest.c',
51 ], 51 ],
52 }, 52 },
53 'targets': [ 53 'targets': [
54 { 54 {
55 'target_name': 'irt_core_nexe', 55 'target_name': 'irt_core_raw_nexe',
56 'type': 'none', 56 'type': 'none',
57 'variables': { 57 'variables': {
58 'nexe_target': 'irt_core', 58 'nexe_target': 'irt_core_raw',
59 # These out_* fields override the default filenames, which
60 # include a "_newlib" suffix and places them in the target
61 # directory.
62 'out_newlib64': '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_64_raw.nexe',
63 'out_newlib32': '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_32_raw.nexe',
64 'out_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/irt_core_arm_raw.nexe',
59 'build_glibc': 0, 65 'build_glibc': 0,
60 'build_newlib': 0, 66 'build_newlib': 0,
61 'build_irt': 1, 67 'build_irt': 1,
62 }, 68 },
63 'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'], 69 'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'],
64 'link_flags': [ 70 'link_flags': [
65 '-lsrpc', 71 '-lsrpc',
66 '-limc_syscalls', 72 '-limc_syscalls',
67 '-lplatform', 73 '-lplatform',
68 '-lgio', 74 '-lgio',
(...skipping 10 matching lines...) Expand all
79 'dependencies': [ 85 'dependencies': [
80 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 86 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
81 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 87 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
82 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib', 88 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
83 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 89 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
84 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', 90 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
85 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 91 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
86 ], 92 ],
87 }, 93 },
88 { 94 {
95 'target_name': 'irt_core_nexe',
96 'type': 'none',
97 'dependencies': [
98 'irt_core_raw_nexe',
99 '<(DEPTH)/native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host',
100 ],
101 'conditions': [
102 ['target_arch=="arm"', {
103 'actions': [
104 {
105 'action_name': 'tls_edit_irt_arm',
106 'message': 'Patching TLS for irt_core (arm)',
107 'msvs_cygwin_shell': 0,
108 'inputs': [
109 '<(PRODUCT_DIR)/tls_edit',
110 '<(SHARED_INTERMEDIATE_DIR)/irt_core_arm_raw.nexe',
111 ],
112 'outputs': [
113 '<(PRODUCT_DIR)/irt_core_newlib_arm.nexe',
114 ],
115 'action': ['<@(_inputs)', '<@(_outputs)'],
116 },
117 ],
118 }],
119 ['target_arch!="arm"', {
120 'actions': [
121 {
122 'action_name': 'tls_edit_irt_x86-64',
123 'message': 'Patching TLS for irt_core (x86-64)',
124 'msvs_cygwin_shell': 0,
125 'inputs': [
126 '<(PRODUCT_DIR)/tls_edit',
127 '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_64_raw.nexe',
128 ],
129 'outputs': [
130 '<(PRODUCT_DIR)/irt_core_newlib_x64.nexe',
131 ],
132 'action': ['<@(_inputs)', '<@(_outputs)'],
133 },
134 {
135 'action_name': 'tls_edit_irt_x86-32',
136 'message': 'Patching TLS for irt_core (x86-32)',
137 'msvs_cygwin_shell': 0,
138 'inputs': [
139 '<(PRODUCT_DIR)/tls_edit',
140 '<(SHARED_INTERMEDIATE_DIR)/irt_core_x86_32_raw.nexe',
141 ],
142 'outputs': [
143 '<(PRODUCT_DIR)/irt_core_newlib_x32.nexe',
144 ],
145 'action': ['<@(_inputs)', '<@(_outputs)'],
146 },
147 ],
148 }],
149 ],
150 },
151 {
89 'target_name': 'irt_browser_lib', 152 'target_name': 'irt_browser_lib',
90 'type': 'none', 153 'type': 'none',
91 'variables': { 154 'variables': {
92 'nlib_target': 'libirt_browser.a', 155 'nlib_target': 'libirt_browser.a',
93 'build_glibc': 0, 156 'build_glibc': 0,
94 'build_newlib': 1, 157 'build_newlib': 1,
95 'build_irt': 1, 158 'build_irt': 1,
96 }, 159 },
97 'sources': ['<@(irt_sources)', '<@(irt_browser)'], 160 'sources': ['<@(irt_sources)', '<@(irt_browser)'],
98 'include_dirs': ['../../../../ppapi'], 161 'include_dirs': ['../../../../ppapi'],
99 'conditions': [ 162 'conditions': [
100 ['target_arch=="arm"', { 163 ['target_arch=="arm"', {
101 'sources': [ 'aeabi_read_tp.S' ], 164 'sources': [ 'aeabi_read_tp.S' ],
102 }], 165 }],
103 ], 166 ],
104 'dependencies': [ 167 'dependencies': [
105 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 168 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
106 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', 169 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
107 ], 170 ],
108 }, 171 },
109 ], 172 ],
110 } 173 }
OLDNEW
« no previous file with comments | « src/trusted/validator_ragel/rdfa_validator.gyp ('k') | src/untrusted/irt/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698