diff options
| author | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-08 00:55:31 +0000 |
|---|---|---|
| committer | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-08 00:55:31 +0000 |
| commit | adb4afa7cbaba82ae44d72fc5edc08efa115f626 (patch) | |
| tree | f89131fe4435257bf7a0984d9fdd76ec4aa84d92 /ppapi | |
| parent | 3106ea3424d35c8ac6b80b26b7b783f4e250cbb0 (diff) | |
| download | chromium_src-adb4afa7cbaba82ae44d72fc5edc08efa115f626.zip chromium_src-adb4afa7cbaba82ae44d72fc5edc08efa115f626.tar.gz chromium_src-adb4afa7cbaba82ae44d72fc5edc08efa115f626.tar.bz2 | |
Build the PNaCl IRT shim with PNaCl + NaCl DEPS bump r12710 -> r12726
The ARM one is completely identical (already built with
PNaCl), the x86-32 version is a bit smaller, and the x86-64
one is a bit bigger.
Drops a PNaCl dependency on GCC.
Pull in untrusted.gypi change w/ NaCl DEPS bump r12710 -> r12716
This pulls in the following Native Client changes:
r12711: (bradnelson) Don't write out .pyc files on the bots.
r12712: (halyavin) Fix handle leak in SimpleRevConnection objects.
r12713: (halyavin) Fix bots failures.
r12714: (yyanagisawa) Make try-except for finding gomacc more explicit.
r12715: (halyavin) Fix incorrect code that causes use-after-free.
r12716: (jvoung) Replace force_arm_pnacl w/ pnacl_native_biased and allow building nlibs.
r12717: (mcgrathr) toolchain_build: Update gdb to 7.7 release
r12718: (noelallen) Add bionic upload
r12719: (dschuff) toolchain_build_pnacl: Add support for cmake, clang, and sanitizers
r12720: (jvoung) PNaCl: Update Clang revision in pnacl/COMPONENT_REVISIONS
r12721: (mseaborn) Remove old sel_main_chrome.h/nacl_chrome.h interface variants
r12722: (jvoung) Add a couple more mnemonics to pnacl-ld (-u, --trace, --library, etc.)
r12723: (dschuff) PNaCl driver: use module-splitting by default for offline translation.
r12724: (dyen) IRT TLS now depends on tls_edit instead of compiling in changes.
r12725: (teravest) NaCl: Remove bad comment in sel_main_chrome.c
r12726: (jvoung) Fix arm rules for pnacl_native_biased in untrusted.gypi.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3784
R=bradnelson@google.com, dschuff@chromium.org
Review URL: https://codereview.chromium.org/137623019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp | 23 |
1 files changed, 9 insertions, 14 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 787d620..e251e3d2 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 @@ -12,12 +12,16 @@ 'type': 'none', 'variables': { 'nlib_target': 'libpnacl_irt_shim.a', - 'out_newlib_arm': '>(tc_lib_dir_pnacl_translate)/lib-arm/libpnacl_irt_shim.a', - 'out_newlib32': '>(tc_lib_dir_pnacl_translate)/lib-x86-32/libpnacl_irt_shim.a', - 'out_newlib64': '>(tc_lib_dir_pnacl_translate)/lib-x86-64/libpnacl_irt_shim.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)', 'build_glibc': 0, - 'build_newlib': 1, - 'force_arm_pnacl': 1, + 'build_newlib': 0, + 'build_pnacl_newlib': 1, + 'pnacl_native_biased': 1, + 'enable_x86_32': 1, + 'enable_x86_64': 1, + 'enable_arm': 1, 'sources': [ 'pnacl_shim.c', 'shim_entry.c', @@ -29,15 +33,6 @@ 'extra_args': [ '--strip-debug', ], - 'conditions': [ - ['target_arch=="arm"', { - 'compile_flags': [ - '--pnacl-allow-translate', - '--pnacl-allow-native', - '-arch', 'arm', - ], - }], - ], }, 'dependencies': [ '<(DEPTH)/native_client/tools.gyp:prep_toolchain', |