mozjs: refresh patch Manually_mmap_heap_memory_esr17.patch

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Andreas Müller 2018-03-20 14:49:13 +01:00 committed by Armin Kuster
parent 6ce3b4f0aa
commit 2363cb3a6a

View File

@ -1,4 +1,4 @@
From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 From 1d1fa95c8ff7697e46343385a79a8f7e5c514a87 Mon Sep 17 00:00:00 2001
From: Zheng Xu <zheng.xu@linaro.org> From: Zheng Xu <zheng.xu@linaro.org>
Date: Fri, 2 Sep 2016 17:40:05 +0800 Date: Fri, 2 Sep 2016 17:40:05 +0800
Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits
@ -16,11 +16,11 @@ Upstream-status: Backport
1 file changed, 71 insertions(+), 2 deletions(-) 1 file changed, 71 insertions(+), 2 deletions(-)
diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
index 5b386a2..38101cf 100644 index e5ad018..4149adf 100644
--- a/js/src/gc/Memory.cpp --- a/js/src/gc/Memory.cpp
+++ b/js/src/gc/Memory.cpp +++ b/js/src/gc/Memory.cpp
@@ -306,6 +306,75 @@ InitMemorySubsystem() @@ -309,6 +309,75 @@ InitMemorySubsystem()
MOZ_CRASH(); #endif
} }
+static inline void * +static inline void *
@ -95,7 +95,7 @@ index 5b386a2..38101cf 100644
void * void *
MapAlignedPages(size_t size, size_t alignment) MapAlignedPages(size_t size, size_t alignment)
{ {
@@ -319,12 +388,12 @@ MapAlignedPages(size_t size, size_t alignment) @@ -322,12 +391,12 @@ MapAlignedPages(size_t size, size_t alignment)
/* Special case: If we want page alignment, no further work is needed. */ /* Special case: If we want page alignment, no further work is needed. */
if (alignment == PageSize) { if (alignment == PageSize) {
@ -110,6 +110,3 @@ index 5b386a2..38101cf 100644
if (region == MAP_FAILED) if (region == MAP_FAILED)
return NULL; return NULL;
--
1.9.1