*** empty log message ***

This commit is contained in:
kurt 2019-10-07 19:16:54 +00:00
parent 9418035520
commit 7176ae0435
2 changed files with 28 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.107 2019/10/01 04:39:31 semarie Exp $
# $OpenBSD: Makefile,v 1.108 2019/10/07 19:16:54 kurt Exp $
COMMENT = Firefox web browser, Extended Support Release
ONLY_FOR_ARCHS = amd64 i386
@ -7,7 +7,7 @@ MOZILLA_VERSION = 68.1.0esr
MOZILLA_BRANCH = release
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
REVISION = 1
REVISION = 2
WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/esr//}
HOMEPAGE = https://www.mozilla.org/firefox/organizations/

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-js_src_jit_ProcessExecutableMemory_cpp,v 1.3 2019/10/07 19:16:54 kurt Exp $
Index: js/src/jit/ProcessExecutableMemory.cpp
--- js/src/jit/ProcessExecutableMemory.cpp.orig
+++ js/src/jit/ProcessExecutableMemory.cpp
@@ -318,6 +318,12 @@ static void DecommitPages(void* addr, size_t bytes) {
}
#else // !XP_WIN
static void* ComputeRandomAllocationAddress() {
+#ifdef __OpenBSD__
+ // OpenBSD already has random mmap and the idea that all x64 cpus
+ // have 48-bit address space is not correct. Returning nullptr
+ // allows OpenBSD do to the right thing.
+ return nullptr;
+#else
uint64_t rand = js::GenerateRandomSeed();
# ifdef HAVE_64BIT_BUILD
@@ -337,6 +343,7 @@ static void* ComputeRandomAllocationAddress() {
// Ensure page alignment.
uintptr_t mask = ~uintptr_t(gc::SystemPageSize() - 1);
return (void*)uintptr_t(rand & mask);
+#endif
}
static void* ReserveProcessExecutableMemory(size_t bytes) {