diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | src/common/linux/memory_mapped_file.cc | 11 | ||||
| -rw-r--r-- | src/common/memory.h | 7 |
3 files changed, 1 insertions, 19 deletions
@@ -59,7 +59,7 @@ deps = { # Linux syscall support. "src/src/third_party/lss": "https://chromium.googlesource.com/linux-syscall-support/" + - "@9292030109847793f7a6689adac1ddafb412fe14" + "@3f6478ac95edf86cd3da300c2c0d34a438f5dbeb", } hooks = [ diff --git a/src/common/linux/memory_mapped_file.cc b/src/common/linux/memory_mapped_file.cc index 592b66c8..4e938269 100644 --- a/src/common/linux/memory_mapped_file.cc +++ b/src/common/linux/memory_mapped_file.cc @@ -87,18 +87,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) { return true; } -#if defined(__x86_64__) || defined(__aarch64__) || \ - (defined(__mips__) && _MIPS_SIM == _ABI64) void* data = sys_mmap(NULL, file_len, PROT_READ, MAP_PRIVATE, fd, offset); -#else - if ((offset & 4095) != 0) { - // Not page aligned. - sys_close(fd); - return false; - } - void* data = sys_mmap2( - NULL, file_len, PROT_READ, MAP_PRIVATE, fd, offset >> 12); -#endif sys_close(fd); if (data == MAP_FAILED) { return false; diff --git a/src/common/memory.h b/src/common/memory.h index 16a612b8..9158b50c 100644 --- a/src/common/memory.h +++ b/src/common/memory.h @@ -44,7 +44,6 @@ #ifdef __APPLE__ #define sys_mmap mmap -#define sys_mmap2 mmap #define sys_munmap munmap #define MAP_ANONYMOUS MAP_ANON #else @@ -117,14 +116,8 @@ class PageAllocator { private: uint8_t *GetNPages(size_t num_pages) { -#if defined(__x86_64__) || defined(__aarch64__) || defined(__aarch64__) || \ - ((defined(__mips__) && _MIPS_SIM == _ABI64)) void *a = sys_mmap(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#else - void *a = sys_mmap2(NULL, page_size_ * num_pages, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -#endif if (a == MAP_FAILED) return NULL; |