diff options
author | Ian Rogers <irogers@google.com> | 2014-06-25 11:52:14 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-06-25 11:55:07 -0700 |
commit | c3ccc1039e0bbc0744f958cb8719cf96bce5b853 (patch) | |
tree | 46be84eae8aba7f1698415752262bc16da72aab6 /runtime/mem_map.cc | |
parent | 3153895d020038cd89311ed6ee241ce9b9f18a59 (diff) | |
download | art-c3ccc1039e0bbc0744f958cb8719cf96bce5b853.tar.gz art-c3ccc1039e0bbc0744f958cb8719cf96bce5b853.tar.bz2 art-c3ccc1039e0bbc0744f958cb8719cf96bce5b853.zip |
Fix the Mac build on x86-64.
Change-Id: I4ed3783a96d844de0b0a295df26d0a48c02a3726
Diffstat (limited to 'runtime/mem_map.cc')
-rw-r--r-- | runtime/mem_map.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/mem_map.cc b/runtime/mem_map.cc index 8d987dfd9a..1074253fea 100644 --- a/runtime/mem_map.cc +++ b/runtime/mem_map.cc @@ -72,7 +72,7 @@ std::ostream& operator<<(std::ostream& os, const std::multimap<void*, MemMap*>& std::multimap<void*, MemMap*> MemMap::maps_; -#if defined(__LP64__) && !defined(__x86_64__) +#if USE_ART_LOW_4G_ALLOCATOR // Handling mem_map in 32b address range for 64b architectures that do not support MAP_32BIT. // The regular start of memory allocations. The first 64KB is protected by SELinux. @@ -235,7 +235,7 @@ MemMap* MemMap::MapAnonymous(const char* name, byte* expected, size_t byte_count // A page allocator would be a useful abstraction here, as // 1) It is doubtful that MAP_32BIT on x86_64 is doing the right job for us // 2) The linear scheme, even with simple saving of the last known position, is very crude -#if defined(__LP64__) && !defined(__x86_64__) +#if USE_ART_LOW_4G_ALLOCATOR // MAP_32BIT only available on x86_64. void* actual = MAP_FAILED; if (low_4gb && expected == nullptr) { @@ -299,7 +299,7 @@ MemMap* MemMap::MapAnonymous(const char* name, byte* expected, size_t byte_count } #else -#ifdef __x86_64__ +#if defined(__LP64__) if (low_4gb && expected == nullptr) { flags |= MAP_32BIT; } |