diff options
author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 02:57:39 +0000 |
---|---|---|
committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-05 02:57:39 +0000 |
commit | 3c7a35b57cfbe8647c1636ce30c43693f346b5a6 (patch) | |
tree | 3f5d0deaa21a34f9336e6ada0dd68734c0c2ee11 /chrome/nacl | |
parent | 1ca1ee2082307e05e67c6f5879026edf54c84979 (diff) | |
download | chromium_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
Diffstat (limited to 'chrome/nacl')
-rw-r--r-- | chrome/nacl/nacl_helper_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 { |