From 39d7699a87344e53238ef3ee4f7beb7c438d65f4 Mon Sep 17 00:00:00 2001 From: Junliang Yan Date: Sun, 23 Sep 2018 17:00:33 +0200 Subject: [PATCH] deps: cherry-pick d48bd16 from upstream V8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message: PPC: use 64KB ASLR hint on PPC Change-Id: I2e461f3f7b3abc666ed5dcc3294a14d27ef0fe60 Reviewed-on: https://chromium-review.googlesource.com/1194583 Reviewed-by: Michael Lippautz Commit-Queue: Junliang Yan Cr-Commit-Position: refs/heads/master@{#55655} Refs: https://github.com/v8/v8/commit/d48bd16c9a053a2c630d09a1550ba8bad6928638 PR-URL: https://github.com/nodejs/node/pull/22909 Reviewed-By: Michaël Zasso --- common.gypi | 2 +- deps/v8/src/base/platform/platform-posix.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.gypi b/common.gypi index e9e05049dbb265..39afdc4d95a28d 100644 --- a/common.gypi +++ b/common.gypi @@ -29,7 +29,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.28', + 'v8_embedder_string': '-node.29', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc index d21107d6f785f6..8b9e85c0e88e06 100644 --- a/deps/v8/src/base/platform/platform-posix.cc +++ b/deps/v8/src/base/platform/platform-posix.cc @@ -246,11 +246,11 @@ void* OS::GetRandomMmapAddr() { // Use extra address space to isolate the mmap regions. raw_addr += uint64_t{0x400000000000}; #elif V8_TARGET_BIG_ENDIAN - // Big-endian Linux: 44 bits of virtual addressing. + // Big-endian Linux: 42 bits of virtual addressing. raw_addr &= uint64_t{0x03FFFFFFF000}; #else - // Little-endian Linux: 48 bits of virtual addressing. - raw_addr &= uint64_t{0x3FFFFFFFF000}; + // Little-endian Linux: 46 bits of virtual addressing. + raw_addr &= uint64_t{0x3FFFFFFF0000}; #endif #elif V8_TARGET_ARCH_MIPS64 // We allocate code in 256 MB aligned segments because of optimizations using