aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/mozjs
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2018-03-20 14:49:13 +0100
committerArmin Kuster <akuster808@gmail.com>2018-04-08 17:00:06 -0700
commit2363cb3a6ac3631268d101537d0820af725a4d5e (patch)
treeb8ea14dc34f64b587065e40a99427ae48601ffad /meta-oe/recipes-extended/mozjs
parent6ce3b4f0aab73bb20147cacc6dc8b3c2e03cb04e (diff)
downloadmeta-openembedded-2363cb3a6ac3631268d101537d0820af725a4d5e.tar.gz
meta-openembedded-2363cb3a6ac3631268d101537d0820af725a4d5e.tar.bz2
meta-openembedded-2363cb3a6ac3631268d101537d0820af725a4d5e.zip
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>
Diffstat (limited to 'meta-oe/recipes-extended/mozjs')
-rw-r--r--meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch13
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch
index 15ad03f71..83f454319 100644
--- a/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch
+++ b/meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch
@@ -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>
Date: Fri, 2 Sep 2016 17:40:05 +0800
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(-)
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
+++ b/js/src/gc/Memory.cpp
-@@ -306,6 +306,75 @@ InitMemorySubsystem()
- MOZ_CRASH();
+@@ -309,6 +309,75 @@ InitMemorySubsystem()
+ #endif
}
+static inline void *
@@ -95,7 +95,7 @@ index 5b386a2..38101cf 100644
void *
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. */
if (alignment == PageSize) {
@@ -110,6 +110,3 @@ index 5b386a2..38101cf 100644
if (region == MAP_FAILED)
return NULL;
---
-1.9.1
-