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

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: Fixed spacing issues in build/common.gypi 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
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': 'tls_edit',
56 'type': 'executable',
57 'toolsets': ['host'],
58 'sources': [
59 'tls_edit.c',
60 ],
61 'dependencies': [
62 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform',
63 '<(DEPTH)/native_client/src/trusted/validator_ragel/rdfa_validator.gyp:r dfa_validator',
64 ],
65 },
66 {
67 'target_name': 'irt_core_raw_nexe',
56 'type': 'none', 68 'type': 'none',
57 'variables': { 69 'variables': {
58 'nexe_target': 'irt_core', 70 'nexe_target': 'irt_core_raw',
59 'build_glibc': 0, 71 'build_glibc': 0,
60 'build_newlib': 0, 72 'build_newlib': 0,
61 'build_irt': 1, 73 'build_irt': 1,
62 }, 74 },
63 'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'], 75 'sources': ['<@(irt_sources)', '<@(irt_nonbrowser)'],
64 'link_flags': [ 76 'link_flags': [
65 '-lsrpc', 77 '-lsrpc',
66 '-limc_syscalls', 78 '-limc_syscalls',
67 '-lplatform', 79 '-lplatform',
68 '-lgio', 80 '-lgio',
(...skipping 10 matching lines...) Expand all
79 'dependencies': [ 91 'dependencies': [
80 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib', 92 '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
81 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib', 93 '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
82 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib', 94 '<(DEPTH)/native_client/src/shared/srpc/srpc.gyp:srpc_lib',
83 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 95 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
84 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', 96 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
85 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 97 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
86 ], 98 ],
87 }, 99 },
88 { 100 {
101 'target_name': 'irt_core_nexe',
102 'type': 'none',
103 'dependencies': [
104 'irt_core_raw_nexe',
105 'tls_edit#host',
106 ],
107 'conditions': [
108 ['target_arch=="arm"', {
109 'actions': [
110 {
111 'action_name': 'tls_edit_irt_arm',
112 'message': 'Patching TLS for irt_core (arm)',
113 'msvs_cygwin_shell': 0,
114 'inputs': [
115 '<(PRODUCT_DIR)/tls_edit',
116 '<(PRODUCT_DIR)/irt_core_raw_newlib_arm.nexe',
117 ],
118 'outputs': [
119 '<(PRODUCT_DIR)/irt_core_newlib_arm.nexe',
120 ],
121 'action': ['<@(_inputs)', '<@(_outputs)'],
122 },
123 ],
124 }],
125 ['target_arch!="arm"', {
126 'actions': [
127 {
128 'action_name': 'tls_edit_irt_x64',
129 'message': 'Patching TLS for irt_core (x86-64)',
130 'msvs_cygwin_shell': 0,
131 'inputs': [
132 '<(PRODUCT_DIR)/tls_edit',
133 '<(PRODUCT_DIR)/irt_core_raw_newlib_x64.nexe',
134 ],
135 'outputs': [
136 '<(PRODUCT_DIR)/irt_core_newlib_x64.nexe',
137 ],
138 'action': ['<@(_inputs)', '<@(_outputs)'],
139 },
140 {
141 'action_name': 'tls_edit_irt_x32',
142 'message': 'Patching TLS for irt_core (x86-32)',
143 'msvs_cygwin_shell': 0,
144 'inputs': [
145 '<(PRODUCT_DIR)/tls_edit',
146 '<(PRODUCT_DIR)/irt_core_raw_newlib_x32.nexe',
147 ],
148 'outputs': [
149 '<(PRODUCT_DIR)/irt_core_newlib_x32.nexe',
150 ],
151 'action': ['<@(_inputs)', '<@(_outputs)'],
152 },
153 ],
154 }],
155 ],
156 },
157 {
89 'target_name': 'irt_browser_lib', 158 'target_name': 'irt_browser_lib',
90 'type': 'none', 159 'type': 'none',
91 'variables': { 160 'variables': {
92 'nlib_target': 'libirt_browser.a', 161 'nlib_target': 'libirt_browser.a',
93 'build_glibc': 0, 162 'build_glibc': 0,
94 'build_newlib': 1, 163 'build_newlib': 1,
95 'build_irt': 1, 164 'build_irt': 1,
96 }, 165 },
97 'sources': ['<@(irt_sources)', '<@(irt_browser)'], 166 'sources': ['<@(irt_sources)', '<@(irt_browser)'],
98 'include_dirs': ['../../../../ppapi'], 167 'include_dirs': ['../../../../ppapi'],
99 'conditions': [ 168 'conditions': [
100 ['target_arch=="arm"', { 169 ['target_arch=="arm"', {
101 'sources': [ 'aeabi_read_tp.S' ], 170 'sources': [ 'aeabi_read_tp.S' ],
102 }], 171 }],
103 ], 172 ],
104 'dependencies': [ 173 'dependencies': [
105 '<(DEPTH)/native_client/tools.gyp:prep_toolchain', 174 '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
106 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib', 175 '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib_newlib',
107 ], 176 ],
108 }, 177 },
109 ], 178 ],
110 } 179 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698