Skip to content

Commit

Permalink
Build the browser IRT shim with nacl-clang instead of biased bitcode.
Browse files Browse the repository at this point in the history 
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}
  • Loading branch information
@sbc100
sbc100 authored and Commit bot committed Feb 10, 2016
1 parent 3439351 commit 862629a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 26 deletions.
15 changes: 1 addition & 14 deletions ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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',
Expand Down
24 changes: 12 additions & 12 deletions ppapi/native_client/src/untrusted/pnacl_support_extension/pnacl_support_extension.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],
},
}],
Expand All @@ -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',
],
},
}],
Expand All @@ -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',
],
},
}],
Expand All @@ -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',
],
},
}],
Expand All @@ -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',
],
},
}],
Expand Down

0 comments on commit 862629a

Please sign in to comment.