commit 0287a6c06633bf13f7da6d66d410fe8ba8e380f7
author Alexandre Rames <alexandre.rames@linaro.com> Wed Nov 16 10:37:05 2016 +0000
committer Alexandre Rames <alexandre.rames@linaro.org> Mon Nov 21 16:52:52 2016 +0000
tree f4f2cd4053b76ff773cec86a7888b09dd341e51a
parent c5beb5d4cf4c96c9a23bb8e37e3275728852e847

Fix compilation on macOS.

Change-Id: I7515f2037c81d56461f243ee62b6df1de3aaf56b

src/code-buffer-vixl.cc

diff --git a/src/code-buffer-vixl.cc b/src/code-buffer-vixl.cc
index ea33e68..65abaea 100644
--- a/src/code-buffer-vixl.cc
+++ b/src/code-buffer-vixl.cc
@@ -43,12 +43,16 @@
   if (capacity_ == 0) {
     return;
   }
+#ifdef __APPLE__
+  buffer_ = reinterpret_cast<byte*>(malloc(capacity_));
+#else
   buffer_ = reinterpret_cast<byte*>(mmap(NULL,
                                          capacity,
                                          PROT_READ | PROT_WRITE,
                                          MAP_PRIVATE | MAP_ANONYMOUS,
                                          -1,
                                          0));
+#endif
   VIXL_CHECK(buffer_ != NULL);
   // Aarch64 instructions must be word aligned, we assert the default allocator
   // always returns word align memory.
@@ -71,7 +75,11 @@
 CodeBuffer::~CodeBuffer() {
   VIXL_ASSERT(!IsDirty());
   if (managed_) {
+#ifdef __APPLE__
+    free(buffer_);
+#else
     munmap(buffer_, capacity_);
+#endif
   }
 }
 
@@ -140,8 +148,13 @@
   VIXL_ASSERT(managed_);
   VIXL_ASSERT(new_capacity > capacity_);
   ptrdiff_t cursor_offset = GetCursorOffset();
+#ifdef __APPLE__
+  buffer_ = static_cast<byte*>(realloc(buffer_, new_capacity));
+  VIXL_CHECK(buffer_ != NULL);
+#else
   buffer_ = static_cast<byte*>(
       mremap(buffer_, capacity_, new_capacity, MREMAP_MAYMOVE));
+#endif
   VIXL_CHECK(buffer_ != MAP_FAILED);
 
   cursor_ = buffer_ + cursor_offset;