diff options
| author | sbc <sbc@chromium.org> | 2016-02-10 09:24:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 17:25:59 +0000 |
| commit | 862629a4bd59c32a7afa38ae204f8c44df184960 (patch) | |
| tree | 61a291384f17d8e2c2f1404104bee495fa156d21 /ppapi | |
| parent | 34393519671e62e5a66602736899b94ad33dd45a (diff) | |
| download | chromium_src-862629a4bd59c32a7afa38ae204f8c44df184960.zip chromium_src-862629a4bd59c32a7afa38ae204f8c44df184960.tar.gz chromium_src-862629a4bd59c32a7afa38ae204f8c44df184960.tar.bz2 | |
Build the browser IRT shim with nacl-clang instead of biased bitcode.
This is one of the few remaining steps to removing biased bitcode (at
least for SFI NaCl).
Review URL: https://codereview.chromium.org/1681413002
Cr-Commit-Position: refs/heads/master@{#374675}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp | 15 | ||||
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp | 24 |
2 files changed, 13 insertions, 26 deletions
diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp index f1cc507..83d67c6 100644 --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp @@ -27,8 +27,6 @@ 'out_newlib32_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-x86-32-nonsfi/>(nlib_target)', 'out_pnacl_newlib_arm_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-arm-nonsfi/>(nlib_target)', 'out_newlib_arm_nonsfi': '>(tc_lib_dir_pnacl_translate)/lib-arm-nonsfi/>(nlib_target)', - 'build_glibc': 0, - 'build_newlib': 0, 'build_pnacl_newlib': 1, 'pnacl_native_biased': 1, 'enable_x86_32': 1, @@ -65,18 +63,7 @@ # pnacl_support_extension rename this to the canonical name when # copying to the final target directory. 'nlib_target': 'libpnacl_irt_shim_browser.a', - 'out_pnacl_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/>(nlib_target)', - 'out_pnacl_newlib_x86_32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/>(nlib_target)', - 'out_pnacl_newlib_x86_64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/>(nlib_target)', - 'out_pnacl_newlib_mips': '>(tc_lib_dir_pnacl_translate)/lib-mips32/>(nlib_target)', - 'build_glibc': 0, - 'build_newlib': 0, - 'build_pnacl_newlib': 1, - 'pnacl_native_biased': 1, - 'enable_x86_32': 1, - 'enable_x86_64': 1, - 'enable_arm': 1, - 'enable_mips': 1, + 'build_newlib': 1, 'sources': [ 'shim_entry.c', 'shim_ppapi.c', 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 3230ae2..7d704ee 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 @@ -62,14 +62,14 @@ '<(pnacl_output_prefix)x86_64_pnacl_llc_nexe', ], 'inputs': [ - '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a', - '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a', + '>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a', + '>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a', ], 'variables': { 'lib_overrides': [ # Use the two freshly generated shims. - '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', - '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', + '--lib_override=ia32,>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', + '--lib_override=x64,>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', ], }, }], @@ -86,12 +86,12 @@ '<(pnacl_output_prefix)arm_pnacl_llc_nexe', ], 'inputs': [ - '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim_browser.a', + '>(tc_lib_dir_newlib_arm)/libpnacl_irt_shim_browser.a', ], 'variables': { 'lib_overrides': [ # Use the freshly generated shim. - '--lib_override=arm,>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', + '--lib_override=arm,>(tc_lib_dir_newlib_arm)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', ], }, }], @@ -105,12 +105,12 @@ '<(pnacl_output_prefix)mips32_pnacl_llc_nexe', ], 'inputs': [ - '>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim_browser.a', + '>(tc_lib_dir_newlib_mips)/libpnacl_irt_shim_browser.a', ], 'variables': { 'lib_overrides': [ # Use the freshly generated shim. - '--lib_override=mipsel,>(tc_lib_dir_pnacl_translate)/lib-mips32/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', + '--lib_override=mipsel,>(tc_lib_dir_newlib_mips)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', ], }, }], @@ -124,12 +124,12 @@ '<(pnacl_output_prefix)x86_32_pnacl_llc_nexe', ], 'inputs': [ - '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a', + '>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a', ], 'variables': { 'lib_overrides': [ # Use the freshly generated shim. - '--lib_override=ia32,>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', + '--lib_override=ia32,>(tc_lib_dir_newlib32)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', ], }, }], @@ -143,12 +143,12 @@ '<(pnacl_output_prefix)x86_64_pnacl_llc_nexe', ], 'inputs': [ - '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a', + '>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a', ], 'variables': { 'lib_overrides': [ # Use the freshly generated shim. - '--lib_override=x64,>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', + '--lib_override=x64,>(tc_lib_dir_newlib64)/libpnacl_irt_shim_browser.a,libpnacl_irt_shim.a', ], }, }], |