Commit 09a4a495 authored by arbenson@google.com's avatar arbenson@google.com

NaCl: Support 64-bit reserved_at_zero value

This change will make the x86-32 sandbox on Linux non-zero-based until the change at http://codereview.chromium.org/10832040/ is committed in Chromium. Also, on Atom, performance will be temporarily reduced but not broken. 

BUG=http://code.google.com/p/nativeclient/issues/detail?id=2927
TEST=trybots

Review URL: https://chromiumcodereview.appspot.com/10826039

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149333 0039d316-1c4b-4281-b951-d872f2087c98
parent f04e861b
...@@ -33,7 +33,8 @@ NaClForkDelegate::NaClForkDelegate() ...@@ -33,7 +33,8 @@ NaClForkDelegate::NaClForkDelegate()
* Note these need to match up with their counterparts in nacl_helper_linux.c * Note these need to match up with their counterparts in nacl_helper_linux.c
* and nacl_helper_bootstrap_linux.c. * and nacl_helper_bootstrap_linux.c.
*/ */
const char kNaClHelperReservedAtZero[] = "--reserved_at_zero=0xXXXXXXXX"; const char kNaClHelperReservedAtZero[] =
"--reserved_at_zero=0xXXXXXXXXXXXXXXXX";
const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX"; const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX";
void NaClForkDelegate::Init(const bool sandboxed, void NaClForkDelegate::Init(const bool sandboxed,
......
...@@ -175,7 +175,7 @@ static void CheckRDebug(char *argv0) { ...@@ -175,7 +175,7 @@ static void CheckRDebug(char *argv0) {
} }
/* /*
* The zygote passes --reserved_at_zero=0xXXXXXXXX. * The zygote passes --reserved_at_zero=0xXXXXXXXXXXXXXXXX.
* nacl_helper_bootstrap replaces the Xs with the amount of prereserved * nacl_helper_bootstrap replaces the Xs with the amount of prereserved
* sandbox memory. * sandbox memory.
* *
......
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