Skip to content

GitLab

T
tangled
Commit 862629a4 authored by sbc's avatar sbc Committed by Commit bot
Browse files
Options

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}
parent 34393519
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 26 deletions
ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
View file @ 862629a4
......@@ -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',
......
ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
View file @ 862629a4
......@@ -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',
],
},
}],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment