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

Unified Diff: ppapi/native_client/native_client.gyp

Issue 9838005: Support for ARM NaCl untrusted runtime build. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ppapi/ppapi_untrusted.gyp » ('j') | ppapi/ppapi_untrusted.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/native_client/native_client.gyp
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index f9ffdb95d6f47722081d3831831555fed8c9997b..a22b6755b27eed02bc13c5f979bfcacdd9781205 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -29,6 +29,12 @@
'<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
],
},
+ {
+ 'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
+ 'files': [
+ '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
+ ],
+ },
],
},
{
@@ -38,6 +44,7 @@
'nexe_target': 'nacl_irt',
'out64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
'out32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+ 'outarm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
'build_glibc': 0,
'build_newlib': 1,
'include_dirs': [
@@ -53,8 +60,27 @@
'-lplatform',
'-lgio',
'-lm',
- '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
- '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
+ '-lpthread',
+ ],
+ 'conditions': [
+ ['target_arch!="arm"',
+ {
+ 'link_flags': [
+ '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+ '-Wl,-Ttext-segment=<(NACL_IRT_TEXT_START)',
+ ]
+ }, { # target_arch == "arm"
+ 'link_flags': [
+ '-Wl,--section-start,.rodata=<(NACL_IRT_DATA_START)',
+ '-Wl,-Ttext=<(NACL_IRT_TEXT_START)',
+ '--pnacl-allow-native',
+ '-arch', 'arm',
+ '-Wt,-mtls-use-call',
+ # TODO(olonho): rethink
+ '-L<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
+ ],
+ },
+ ],
],
'sources': [
],
@@ -77,6 +103,15 @@
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libimc_syscalls.a',
'<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libgio.a',
],
+ 'extra_depsarm': [
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libppruntime.a',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libirt_browser.a',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libsrpc.a',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libplatform.a',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libimc_syscalls.a',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libgio.a',
+ '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm/libpthread.a',
+ ],
},
'dependencies': [
'src/shared/ppapi_proxy/ppapi_proxy_untrusted.gyp:ppruntime_lib',
@@ -84,6 +119,7 @@
'../../native_client/src/shared/srpc/srpc.gyp:srpc_lib',
'../../native_client/src/shared/platform/platform.gyp:platform_lib',
'../../native_client/src/untrusted/nacl/nacl.gyp:imc_syscalls_lib',
+ '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
'../../native_client/src/shared/gio/gio.gyp:gio_lib',
],
},
« no previous file with comments | « no previous file | ppapi/ppapi_untrusted.gyp » ('j') | ppapi/ppapi_untrusted.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698