diff options
| author | Ying Wang <wangying@google.com> | 2011-07-01 15:24:14 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-07-01 15:32:31 -0700 |
| commit | 0702eea209b208513ca9082a76abb929b287ecea (patch) | |
| tree | df63b372e97956c9e8c0042461dd6b29e66fed90 | |
| parent | 87753bd9f2750117d64b505be618ce9dd9c57d10 (diff) | |
| download | linkloader-0702eea209b208513ca9082a76abb929b287ecea.tar.gz | |
Fix Mac build.
Change-Id: I6cbbcf51d570407b4ee2a1f15c45a9c6d3cf0d61
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | include/ELFSymbol.h | 4 | ||||
| -rw-r--r-- | lib/MemChunk.cpp | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -79,6 +79,10 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ $(LOCAL_C_INCLUDES) +ifeq (darwin,$(BUILD_OS)) +LOCAL_CFLAGS += -DMACOSX +endif + include $(LLVM_ROOT_PATH)/llvm-host-build.mk include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/include/ELFSymbol.h b/include/ELFSymbol.h index c8f14d8..1b1e218 100644 --- a/include/ELFSymbol.h +++ b/include/ELFSymbol.h @@ -25,7 +25,11 @@ #include <string> #include <algorithm> +#ifdef MACOSX +#include <malloc/malloc.h> +#else #include <malloc.h> +#endif #include <stdint.h> #include <stdlib.h> diff --git a/lib/MemChunk.cpp b/lib/MemChunk.cpp index dd8405b..605d800 100644 --- a/lib/MemChunk.cpp +++ b/lib/MemChunk.cpp @@ -44,7 +44,7 @@ MemChunk::~MemChunk() { bool MemChunk::allocate(size_t size) { buf = (unsigned char *)mmap((void *)StartAddr, size, PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS | MAP_32BIT, + MAP_PRIVATE | MAP_ANON | MAP_32BIT, -1, 0); if (buf == MAP_FAILED) { |