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

Side by Side Diff: ppapi/native_client/native_client.gyp

Issue 11348347: Link in proper TLS accessor implementation into untusted ARM IRT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | « no previous file | no next file » | 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_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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 'conditions': [ 108 'conditions': [
109 ['target_arch!="arm"', 109 ['target_arch!="arm"',
110 { 110 {
111 'sources': [ 111 'sources': [
112 ], 112 ],
113 'link_flags': [ 113 'link_flags': [
114 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', 114 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
115 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', 115 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
116 ] 116 ]
117 }, { # target_arch == "arm" 117 }, { # target_arch == "arm"
118 # TODO(mcgrathr): This knowledge really belongs in 118 # TODO(mcgrathr): This knowledge really belongs in
Mark Seaborn 2012/12/03 16:10:51 Please copy this TODO into the case you added.
119 # native_client/src/untrusted/irt/irt.gyp instead of here. 119 # native_client/src/untrusted/irt/irt.gyp instead of here.
120 # But that builds libirt_browser.a as bitcode, so a native 120 # But that builds libirt_browser.a as bitcode, so a native
121 # object does not fit happily there. 121 # object does not fit happily there.
122 'sources': [ 122 'sources': [
123 '../../native_client/src/untrusted/irt/aeabi_read_tp.S', 123 '../../native_client/src/untrusted/irt/aeabi_read_tp.S',
124 ], 124 ],
125 'link_flags': [ 125 'link_flags': [
126 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', 126 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
127 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', 127 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
128 '--pnacl-allow-native', 128 '--pnacl-allow-native',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'sources': [
275 '../../native_client/src/untrusted/irt/aeabi_read_tp.S',
276 ],
274 'link_flags': [ 277 'link_flags': [
275 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', 278 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
276 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', 279 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
277 '--pnacl-allow-native', 280 '--pnacl-allow-native',
278 '-arch', 'arm', 281 '-arch', 'arm',
279 '-Wt,-mtls-use-call', 282 '-Wt,-mtls-use-call',
280 ], 283 ],
281 }, 284 },
282 ], 285 ],
283 ], 286 ],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 442 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
440 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 443 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
441 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 444 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
442 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 445 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
443 ], 446 ],
444 }, 447 },
445 ], 448 ],
446 }], 449 }],
447 ], 450 ],
448 } 451 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698