diff options
| author | stichnot <stichnot@chromium.org> | 2016-02-22 17:06:16 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-23 01:08:20 +0000 |
| commit | e7ccc4aea79d9be006ba935c43b425058eed266f (patch) | |
| tree | e86e4f49f1b97716e2ad76300863a86227b2f3a2 /ppapi | |
| parent | 4592135a846a2e64e9b7ec086d8d4c1815d16401 (diff) | |
| download | chromium_src-e7ccc4aea79d9be006ba935c43b425058eed266f.zip chromium_src-e7ccc4aea79d9be006ba935c43b425058eed266f.tar.gz chromium_src-e7ccc4aea79d9be006ba935c43b425058eed266f.tar.bz2 | |
PNaCl: Enable the Subzero translator for x86-64.
On the x86-64 architecture, use pnacl-sz instead of pnacl-llc when the PNaCl manifest file explicitly specifies O0 translation.
BUG=588337
TEST= git cl try -b linux_chromium_dbg_32_ng
Review URL: https://codereview.chromium.org/1716783003
Cr-Commit-Position: refs/heads/master@{#376885}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn | 1 | ||||
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn index c8cd12d..d9162cf 100644 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/BUILD.gn @@ -47,6 +47,7 @@ if (enable_nacl) { "libgcc_a", "libpnacl_irt_shim_a", "pnacl_llc_nexe", + "pnacl_sz_nexe", ] if (target_cpu == "arm") { diff --git a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp index 7d704ee..649b7c8 100644 --- a/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp +++ b/ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp @@ -54,12 +54,14 @@ '<(pnacl_output_prefix)x86_32_libgcc_a', '<(pnacl_output_prefix)x86_32_libpnacl_irt_shim_a', '<(pnacl_output_prefix)x86_32_pnacl_llc_nexe', + '<(pnacl_output_prefix)x86_32_pnacl_sz_nexe', '<(pnacl_output_prefix)x86_64_crtbegin_o', '<(pnacl_output_prefix)x86_64_ld_nexe', '<(pnacl_output_prefix)x86_64_libcrt_platform_a', '<(pnacl_output_prefix)x86_64_libgcc_a', '<(pnacl_output_prefix)x86_64_libpnacl_irt_shim_a', '<(pnacl_output_prefix)x86_64_pnacl_llc_nexe', + '<(pnacl_output_prefix)x86_64_pnacl_sz_nexe', ], 'inputs': [ '>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a', @@ -122,6 +124,7 @@ '<(pnacl_output_prefix)x86_32_libgcc_a', '<(pnacl_output_prefix)x86_32_libpnacl_irt_shim_a', '<(pnacl_output_prefix)x86_32_pnacl_llc_nexe', + '<(pnacl_output_prefix)x86_32_pnacl_sz_nexe', ], 'inputs': [ '>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a', @@ -141,6 +144,7 @@ '<(pnacl_output_prefix)x86_64_libgcc_a', '<(pnacl_output_prefix)x86_64_libpnacl_irt_shim_a', '<(pnacl_output_prefix)x86_64_pnacl_llc_nexe', + '<(pnacl_output_prefix)x86_64_pnacl_sz_nexe', ], 'inputs': [ '>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a', |