diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-12 12:58:29 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-04-12 17:30:06 +0200 |
| commit | fd09b7d9b54ccb4d737747ee7fba26f15f4901cd (patch) | |
| tree | cb8b68211b0eff5c2b4927182c93749b053edb71 /src/3rdparty/masm/wtf/OSAllocatorPosix.cpp | |
| parent | 89be8e111c34bf6e96710e574c251587dd59f42b (diff) | |
WTF/JSC update to r148273
This brings in various bug fixes in the ARM and MIPS assemblers as well as
a Yarr crash fix and performance fix.
This change doesn't compile as-is, but the next change will
apply the modifications necessary to compile. That'll make future updates
easier as it allows for cherry-picking because the modifications are usually
always the same.
Change-Id: Iac32f62c71e8ff908deb41f28f12fbc98c0823e1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/masm/wtf/OSAllocatorPosix.cpp')
| -rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorPosix.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp index 27ef02805d..7b2a55c6b6 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorPosix.cpp @@ -26,16 +26,14 @@ #include "config.h" #include "OSAllocator.h" +#if OS(UNIX) + #include "PageAllocation.h" #include <errno.h> #include <sys/mman.h> #include <wtf/Assertions.h> #include <wtf/UnusedParam.h> -#if (OS(DARWIN) && CPU(X86_64)) -#include <stdlib.h> -#endif - namespace WTF { void* OSAllocator::reserveUncommitted(size_t bytes, Usage usage, bool writable, bool executable, bool includesGuardPages) @@ -46,6 +44,11 @@ void* OSAllocator::reserveUncommitted(size_t bytes, Usage usage, bool writable, if (result == MAP_FAILED) CRASH(); #elif OS(LINUX) + UNUSED_PARAM(usage); + UNUSED_PARAM(writable); + UNUSED_PARAM(executable); + UNUSED_PARAM(includesGuardPages); + void* result = mmap(0, bytes, PROT_NONE, MAP_NORESERVE | MAP_PRIVATE | MAP_ANON, -1, 0); if (result == MAP_FAILED) CRASH(); @@ -186,3 +189,5 @@ void OSAllocator::releaseDecommitted(void* address, size_t bytes) } } // namespace WTF + +#endif // OS(UNIX) |