summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 02:57:39 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-05 02:57:39 +0000
commit3c7a35b57cfbe8647c1636ce30c43693f346b5a6 (patch)
tree3f5d0deaa21a34f9336e6ada0dd68734c0c2ee11
parent1ca1ee2082307e05e67c6f5879026edf54c84979 (diff)
downloadchromium_src-3c7a35b57cfbe8647c1636ce30c43693f346b5a6.zip
chromium_src-3c7a35b57cfbe8647c1636ce30c43693f346b5a6.tar.gz
chromium_src-3c7a35b57cfbe8647c1636ce30c43693f346b5a6.tar.bz2
NaCl: Update revision in DEPS, r8733 -> r8774
The starred changes below required additional Chrome-side changes: * required the change to native_client.gyp. ** required a PNaCl toolchain update. *** required a #include change. This pulls in the following Native Client changes: r8734: (robertm) Enable higher optimization level when building ld-gold-sb. r8735: (robertm) Attempt to green the x86-32 torture test bot r8736: (jvoung) Bump llvm rev for dangling debug info workaround. r8737: (jvoung) Add a test for bitcode linking + dwarf local var info. r8738: (jvoung) bump llvm rev for clashing compile unit ID for same source file change: r8739: (mseaborn) Remove a duplicated implementation of NaClDescEffectorTrustedMem r8740: (bradnelson) Don't attempt to archive coverage information on coverage trybots. r8741: (robertm) Do not build the obsolete sandboxed binutils ld anymore. r8742: (bradnelson) Stop uploading with caching turned off. r8743: (mcgrathr) Remove some variables set but not used r8744: (mseaborn) NaClDesc: Make the Unmap() and UnmapUnsafe() methods Windows-only r8745: (kschimpf) Define a baseline and testing patterns for ARM load_store_word_byte table. *r8746: (bradnelson) Reducing duplication. r8748: (jvoung) Try removing ppapi_example_audio from pyauto tests. r8749: (bradnelson) Fixing ARM inconsistency in untrusted.gypi introduced in r8746. r8750: (jvoung) Revert "Define a baseline and testing patterns for ARM load_store_word_byte table." r8751: (jvoung) Bump llvm rev for local var dwarf info + bitcode linking fix r8752: (halyavin) Update deps which includes using NaCl osabi in GDB. Use NaCl osabi in debug r8754: (eaeltsin) Debug stub: cleanup - get rid of Target::send_done_ r8755: (robertm) Misc cleanup in pnacls's nativeld driver r8756: (robertm) Document randomness in calling convention test better r8757: (robertm) Update PNaCl TC to rev 8741 to pull in changes to the linker. r8759: (halyavin) Bump REVISIONS. r8760: (dschuff) Set PNACL_BUILDBOT in buildbot/pnacl.sh to allow dumping of log files in build steps r8761: (mseaborn) Re-enable run_trusted_mmap_test under ARM QEMU since it works fine there r8762: (mcgrathr) Add testdata files for unaligned_data test r8763: (kschimpf) Improve error reporting of arm validator. r8764: (robertm) Merge pnacl tc builder script into pnacl bot scripts r8765: (jvoung) Remove adhoc shared lib test so that "pnacl/test.sh test-all" r8766: (dschuff) Prepend instead of append -lplatform when linking platform_qualify tests r8767: (bradnelson) Making download_toolchains more noisy by default. **r8768: (jvoung) Enable '-g' for pnacl and ARM. We've worked around and/or r8769: (sehr) Get runnable-ld.so 0mod16 alignment change. ***r8770: (ncbray) Move sandbox memory preservation from sel_memory.h to sel_addrspace.h r8771: (mcgrathr) SCons build tweaks to enable using a custom native ARM toolchain r8772: (jvoung) Bump pnacl rev for debug info changes. r8774: (mseaborn) Add code for address space teardown for use in tests BUG=none TEST=nacl_integration Review URL: https://chromiumcodereview.appspot.com/10509010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140482 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS28
-rw-r--r--chrome/nacl/nacl_helper_linux.cc2
-rw-r--r--ppapi/native_client/native_client.gyp8
3 files changed, 20 insertions, 18 deletions
diff --git a/DEPS b/DEPS
index eb3bdb3..e037416 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ vars = {
"webkit_revision": "119404",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "8733",
+ "nacl_revision": "8774",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "8673", # native_client/DEPS: tools_rev
@@ -20,29 +20,29 @@ vars = {
# After changing nacl_toolchain_revision, run 'gclient runhooks' to get the
# new values.
"nacl_toolchain_linux_x86_hash":
- "832431536b1245b49dae211851e9e8a23e06d5e8",
+ "d82ef6eea6ff6ba427efa70461c2fc411d64569f",
"nacl_toolchain_linux_x86_newlib_hash":
- "3dc2a7fa55900a0a4d3258eea6bdabf5ccce6bf8",
+ "849a8cf371e17a685b9429a69474f328454b5e06",
"nacl_toolchain_mac_x86_hash":
- "06d431637113afe0ba14f9eaaf8049022251bcf7",
+ "42575a21646027d52778240c03246d4534c98956",
"nacl_toolchain_mac_x86_newlib_hash":
- "baa113d75a181ca88d4c3c33ccda7301ead0ae29",
+ "4f072a30b55ce9088ed6c6a0033dffa3a8ae301b",
"nacl_toolchain_pnacl_linux_x86_32_hash":
- "bf3be22a2b473aac3ee58e99a45254f385975467",
+ "36d1121c16b249fe11c24b3f149a75a9da906517",
"nacl_toolchain_pnacl_linux_x86_64_hash":
- "d75fc5f81c5ed039fde6b3f76a0425024c12e79f",
+ "01aed2db78ee87cccf7599931c87fea244e8bd54",
"nacl_toolchain_pnacl_mac_x86_32_hash":
- "fefe688c8d39e4bd103c98fdda7e66d1988b2809",
+ "333538f719ddd7742cda120cc1b70ced4d1d72ed",
"nacl_toolchain_pnacl_translator_hash":
- "fc1984dabfb21700feb2b29f17a14b15ab8f8a5b",
+ "6d8c5b8c0613556f39e5132d1a7b9b65e020e01e",
"nacl_toolchain_pnacl_win_x86_32_hash":
- "21efccfdd0c567b46ed568acbb931a686505f4dd",
+ "32c786bb095acfa0a0c5942e355af2ef03dec9dd",
"nacl_toolchain_win_x86_hash":
- "971ffcb4dd2985c85b3b49ede095d13754145798",
+ "85d9b16cb503a10963654803c4a4f90ea6edfff2",
"nacl_toolchain_win_x86_newlib_hash":
- "40165d4b6c1d4c6bfdaafdf74b98adf0de83060d",
- "nacl_toolchain_revision": "8612",
- "pnacl_toolchain_revision": "8612",
+ "cd4f8209a6f87d8baf21d1610928a3def4306764",
+ "nacl_toolchain_revision": "8715",
+ "pnacl_toolchain_revision": "8751",
"libjingle_revision": "145",
"libphonenumber_revision": "456",
diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc
index 20ef4d2..a187538 100644
--- a/chrome/nacl/nacl_helper_linux.cc
+++ b/chrome/nacl/nacl_helper_linux.cc
@@ -25,7 +25,7 @@
#include "chrome/nacl/nacl_listener.h"
#include "crypto/nss_util.h"
#include "ipc/ipc_switches.h"
-#include "native_client/src/trusted/service_runtime/sel_memory.h"
+#include "native_client/src/trusted/service_runtime/sel_addrspace.h"
namespace {
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index f4e96a5..df3007e3 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -42,9 +42,11 @@
'type': 'none',
'variables': {
'nexe_target': 'nacl_irt',
- 'out64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
- 'out32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
- 'out_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
+ # These out_* fields override the default filenames, which
+ # include a "_newlib" suffix.
+ 'out_newlib64': '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
+ 'out_newlib32': '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
+ 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_irt_arm.nexe',
'build_glibc': 0,
'build_newlib': 1,
'include_dirs': [