--- a/components/desktop/thunderbird/patches/firefox-39-gc-memory.patch Fri Sep 30 21:33:56 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-Remove unnecessary functions for memory.
-Do not plan to send upstream.
-
-diff --git a/js/src/gc/Memory.cpp b/js/src/gc/Memory.cpp
---- a/js/src/gc/Memory.cpp
-+++ b/js/src/gc/Memory.cpp
-@@ -12,21 +12,16 @@
- #include "js/HeapAPI.h"
- #include "vm/Runtime.h"
-
- #if defined(XP_WIN)
-
- #include "jswin.h"
- #include <psapi.h>
-
--#elif defined(SOLARIS)
--
--#include <sys/mman.h>
--#include <unistd.h>
--
- #elif defined(XP_UNIX)
-
- #include <algorithm>
- #include <errno.h>
- #include <sys/mman.h>
- #include <sys/resource.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -346,85 +346,6 @@ DeallocateMappedContent(void* p, size_t
- // TODO: Bug 988813 - Support memory mapped array buffer for Windows platform.
- }
-
--#elif defined(SOLARIS)
--
--#ifndef MAP_NOSYNC
--# define MAP_NOSYNC 0
--#endif
--
--void
--InitMemorySubsystem()
--{
-- if (pageSize == 0)
-- pageSize = allocGranularity = size_t(sysconf(_SC_PAGESIZE));
--}
--
--void*
--MapAlignedPages(size_t size, size_t alignment)
--{
-- MOZ_ASSERT(size >= alignment);
-- MOZ_ASSERT(size % alignment == 0);
-- MOZ_ASSERT(size % pageSize == 0);
-- MOZ_ASSERT(alignment % allocGranularity == 0);
--
-- int prot = PROT_READ | PROT_WRITE;
-- int flags = MAP_PRIVATE | MAP_ANON | MAP_ALIGN | MAP_NOSYNC;
--
-- void* p = mmap((caddr_t)alignment, size, prot, flags, -1, 0);
-- if (p == MAP_FAILED)
-- return nullptr;
-- return p;
--}
--
--static void*
--MapAlignedPagesLastDitch(size_t size, size_t alignment)
--{
-- return nullptr;
--}
--
--void
--UnmapPages(void* p, size_t size)
--{
-- MOZ_ALWAYS_TRUE(0 == munmap((caddr_t)p, size));
--}
--
--bool
--MarkPagesUnused(void* p, size_t size)
--{
-- MOZ_ASSERT(OffsetFromAligned(p, pageSize) == 0);
-- return true;
--}
--
--bool
--MarkPagesInUse(void* p, size_t size)
--{
-- if (!DecommitEnabled())
-- return true;
--
-- MOZ_ASSERT(OffsetFromAligned(p, pageSize) == 0);
-- return true;
--}
--
--size_t
--GetPageFaultCount()
--{
-- return 0;
--}
--
--void*
--AllocateMappedContent(int fd, size_t offset, size_t length, size_t alignment)
--{
-- // Not implemented.
-- return nullptr;
--}
--
--// Deallocate mapped memory for object.
--void
--DeallocateMappedContent(void* p, size_t length)
--{
-- // Not implemented.
--}
--
- #elif defined(XP_UNIX)
-
- void
-@@ -599,17 +521,17 @@ UnmapPages(void* p, size_t size)
-
- bool
- MarkPagesUnused(void* p, size_t size)
- {
- if (!DecommitEnabled())
- return false;
-
- MOZ_ASSERT(OffsetFromAligned(p, pageSize) == 0);
-- int result = madvise(p, size, MADV_DONTNEED);
-+ int result = madvise((caddr_t)p, size, MADV_DONTNEED);
- return result != -1;
- }
-
- bool
- MarkPagesInUse(void* p, size_t size)
- {
- if (!DecommitEnabled())
- return true;