diff options
| author | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 08:36:53 +0000 |
|---|---|---|
| committer | dyen@chromium.org <dyen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 08:36:53 +0000 |
| commit | 5af9de10f3050fdb7ceed8f2b143f2e0c1ef8493 (patch) | |
| tree | 302a1ac1c9cec0be953751fb6dabc2df4e5f1c0b /ppapi/native_client | |
| parent | fed4381d5b773617e9ad4c0adcef7a50409bbb25 (diff) | |
| download | chromium_src-5af9de10f3050fdb7ceed8f2b143f2e0c1ef8493.zip chromium_src-5af9de10f3050fdb7ceed8f2b143f2e0c1ef8493.tar.gz chromium_src-5af9de10f3050fdb7ceed8f2b143f2e0c1ef8493.tar.bz2 | |
nacl_irt now uses tls_edit to modify the TLS usage as a post-process.
Mirroring the change for irt_core in the native client tree, we now
use tls_edit as a post process to modify the TLS usage for the IRT.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3127
TEST= trybots
Review URL: https://codereview.chromium.org/141293007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
| -rw-r--r-- | ppapi/native_client/native_client.gyp | 71 |
1 files changed, 65 insertions, 6 deletions
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp index ca4601f..29a4c7e 100644 --- a/ppapi/native_client/native_client.gyp +++ b/ppapi/native_client/native_client.gyp @@ -88,15 +88,16 @@ ], }, { - 'target_name': 'nacl_irt', + 'target_name': 'nacl_irt_raw', 'type': 'none', 'variables': { - 'nexe_target': 'nacl_irt', + 'nexe_target': 'nacl_irt_raw', # These out_* fields override the default filenames, which - # include a "_newlib" suffix. - 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', - 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', - 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe', + # include a "_newlib" suffix and places them in the target + # directory. + 'out_newlib64': '<(SHARED_INTERMEDIATE_DIR)/nacl_irt_x86_64_raw.nexe', + 'out_newlib32': '<(SHARED_INTERMEDIATE_DIR)/nacl_irt_x86_32_raw.nexe', + 'out_newlib_arm': '<(SHARED_INTERMEDIATE_DIR)/nacl_irt_arm_raw.nexe', 'build_glibc': 0, 'build_newlib': 0, 'build_irt': 1, @@ -232,6 +233,64 @@ '../../native_client/src/shared/gio/gio.gyp:gio_lib', ], }, + { + 'target_name': 'nacl_irt', + 'type': 'none', + 'dependencies': [ + '../../native_client/src/tools/tls_edit/tls_edit.gyp:tls_edit#host', + 'nacl_irt_raw' + ], + 'conditions': [ + ['target_arch=="arm"', { + 'actions': [ + { + 'action_name': 'tls_edit_nacl_irt_arm', + 'message': 'Patching TLS for nacl_irt (arm)', + 'inputs': [ + '<(PRODUCT_DIR)/tls_edit', + '<(SHARED_INTERMEDIATE_DIR)/nacl_irt_arm_raw.nexe', + ], + 'outputs': [ + '<(PRODUCT_DIR)/nacl_irt_arm.nexe', + ], + 'action': ['<@(_inputs)', '<@(_outputs)'], + }, + ], + }], + ['target_arch=="x64" or OS=="win"', { + 'actions': [ + { + 'action_name': 'tls_edit_nacl_irt_x86_64', + 'message': 'Patching TLS for nacl_irt (x86-64)', + 'inputs': [ + '<(PRODUCT_DIR)/tls_edit', + '<(SHARED_INTERMEDIATE_DIR)/nacl_irt_x86_64_raw.nexe', + ], + 'outputs': [ + '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', + ], + 'action': ['<@(_inputs)', '<@(_outputs)'], + }, + ], + }], + ['target_arch=="ia32"', { + 'actions': [ + { + 'action_name': 'tls_edit_nacl_irt_x86_32', + 'message': 'Patching TLS for nacl_irt (x86-32)', + 'inputs': [ + '<(PRODUCT_DIR)/tls_edit', + '<(SHARED_INTERMEDIATE_DIR)/nacl_irt_x86_32_raw.nexe', + ], + 'outputs': [ + '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', + ], + 'action': ['<@(_inputs)', '<@(_outputs)'], + }, + ], + }], + ], + }, ], }], ], |