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

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

Issue 10909216: NaCl: Fix ARM Gyp build of IRT to include IRT-private __aeabi_read_tp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ], 101 ],
102 # See http://code.google.com/p/nativeclient/issues/detail?id=2691. 102 # See http://code.google.com/p/nativeclient/issues/detail?id=2691.
103 # The PNaCl linker (gold) does not implement the "-Ttext-segment" 103 # The PNaCl linker (gold) does not implement the "-Ttext-segment"
104 # option. However, with the linker for x86, the "-Ttext" option 104 # option. However, with the linker for x86, the "-Ttext" option
105 # does not affect the executable's base address. 105 # does not affect the executable's base address.
106 # TODO(olonho): simplify flags handling and avoid duplication 106 # TODO(olonho): simplify flags handling and avoid duplication
107 # with NaCl logic. 107 # with NaCl logic.
108 'conditions': [ 108 'conditions': [
109 ['target_arch!="arm"', 109 ['target_arch!="arm"',
110 { 110 {
111 'sources': [
112 ],
111 'link_flags': [ 113 'link_flags': [
112 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', 114 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
113 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)', 115 '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
114 ] 116 ]
115 }, { # target_arch == "arm" 117 }, { # target_arch == "arm"
118 # TODO(mcgrathr): This knowledge really belongs in
119 # native_client/src/untrusted/irt/irt.gyp instead of here.
120 # But that builds libirt_browser.a as bitcode, so a native
121 # object does not fit happily there.
122 'sources': [
123 '../../native_client/src/untrusted/irt/aeabi_read_tp.S',
124 ],
116 'link_flags': [ 125 'link_flags': [
117 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)', 126 '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
118 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)', 127 '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
119 '--pnacl-allow-native', 128 '--pnacl-allow-native',
120 '-arch', 'arm', 129 '-arch', 'arm',
121 '-Wt,-mtls-use-call', 130 '-Wt,-mtls-use-call',
122 ], 131 ],
123 }, 132 },
124 ], 133 ],
125 ], 134 ],
126 'sources': [
127 ],
128 'extra_args': [ 135 'extra_args': [
129 '--strip-debug', 136 '--strip-debug',
130 ], 137 ],
131 # TODO(bradchen): get rid of extra_deps64 and extra_deps32 138 # TODO(bradchen): get rid of extra_deps64 and extra_deps32
132 # once native_client/build/untrusted.gypi no longer needs them. 139 # once native_client/build/untrusted.gypi no longer needs them.
133 'extra_deps64': [ 140 'extra_deps64': [
134 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a', 141 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppruntime.a',
135 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a', 142 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libbase_untrusted.a',
136 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a', 143 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libirt_browser.a',
137 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_suppo rt_untrusted.a', 144 '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libshared_memory_suppo rt_untrusted.a',
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib', 439 '../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
433 '../../native_client/src/shared/platform/platform.gyp:platform_lib', 440 '../../native_client/src/shared/platform/platform.gyp:platform_lib',
434 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib', 441 '../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
435 '../../native_client/src/shared/gio/gio.gyp:gio_lib', 442 '../../native_client/src/shared/gio/gio.gyp:gio_lib',
436 ], 443 ],
437 }, 444 },
438 ], 445 ],
439 }], 446 }],
440 ], 447 ],
441 } 448 }
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