diff options
-rw-r--r-- | meta-oe/recipes-extended/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch | 13 |
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 @@ | |||
1 | From a0c0f32299419359b44ac0f880c1ea9073ae51e1 Mon Sep 17 00:00:00 2001 | 1 | From 1d1fa95c8ff7697e46343385a79a8f7e5c514a87 Mon Sep 17 00:00:00 2001 |
2 | From: Zheng Xu <zheng.xu@linaro.org> | 2 | From: Zheng Xu <zheng.xu@linaro.org> |
3 | Date: Fri, 2 Sep 2016 17:40:05 +0800 | 3 | Date: Fri, 2 Sep 2016 17:40:05 +0800 |
4 | Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits | 4 | Subject: [PATCH] Bug 1143022 - Manually mmap on arm64 to ensure high 17 bits |
@@ -16,11 +16,11 @@ Upstream-status: Backport | |||
16 | 1 file changed, 71 insertions(+), 2 deletions(-) | 16 | 1 file changed, 71 insertions(+), 2 deletions(-) |
17 | 17 | ||
18 | diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp | 18 | diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp |
19 | index 5b386a2..38101cf 100644 | 19 | index e5ad018..4149adf 100644 |
20 | --- a/js/src/gc/Memory.cpp | 20 | --- a/js/src/gc/Memory.cpp |
21 | +++ b/js/src/gc/Memory.cpp | 21 | +++ b/js/src/gc/Memory.cpp |
22 | @@ -306,6 +306,75 @@ InitMemorySubsystem() | 22 | @@ -309,6 +309,75 @@ InitMemorySubsystem() |
23 | MOZ_CRASH(); | 23 | #endif |
24 | } | 24 | } |
25 | 25 | ||
26 | +static inline void * | 26 | +static inline void * |
@@ -95,7 +95,7 @@ index 5b386a2..38101cf 100644 | |||
95 | void * | 95 | void * |
96 | MapAlignedPages(size_t size, size_t alignment) | 96 | MapAlignedPages(size_t size, size_t alignment) |
97 | { | 97 | { |
98 | @@ -319,12 +388,12 @@ MapAlignedPages(size_t size, size_t alignment) | 98 | @@ -322,12 +391,12 @@ MapAlignedPages(size_t size, size_t alignment) |
99 | 99 | ||
100 | /* Special case: If we want page alignment, no further work is needed. */ | 100 | /* Special case: If we want page alignment, no further work is needed. */ |
101 | if (alignment == PageSize) { | 101 | if (alignment == PageSize) { |
@@ -110,6 +110,3 @@ index 5b386a2..38101cf 100644 | |||
110 | if (region == MAP_FAILED) | 110 | if (region == MAP_FAILED) |
111 | return NULL; | 111 | return NULL; |
112 | 112 | ||
113 | -- | ||
114 | 1.9.1 | ||
115 | |||