Bug 1299330 - Unbreak build on BSDs after
bug 1287967. r?luke
MozReview-Commit-ID: KfZItwYpnzc
--- a/js/src/vm/ArrayBufferObject.cpp
+++ b/js/src/vm/ArrayBufferObject.cpp
@@ -546,24 +546,24 @@ class js::WasmArrayRawBuffer
MOZ_RELEASE_ASSERT(newMax.isValid());
MOZ_RELEASE_ASSERT(newMax.value() % wasm::PageSize == 0);
size_t newMapped = wasm::LegalizeMapLength(newMax.value());
# ifdef XP_WIN
if (!VirtualAlloc(dataPointer(), newMapped, MEM_RESERVE, PAGE_NOACCESS))
return;
-# elif defined(XP_DARWIN)
+# elif defined(XP_LINUX)
+ // Note this will not move memory (no MREMAP_MAYMOVE specified)
+ if (MAP_FAILED == mremap(dataPointer(), mappedSize_, newMapped, 0))
+ return;
+# else
// No mechanism for remapping on MaxOS. Luckily shouldn't need it here
// as most MacOS configs are 64 bit
return;
-#else // Unix
- // Note this will not move memory (no MREMAP_MAYMOVE specified)
- if (MAP_FAILED == mremap(dataPointer(), mappedSize_, newMapped, 0))
- return;
# endif // !XP_WIN
mappedSize_ = newMapped;
maxSize_ = Some(newMax.value());
return;
}
};