diff options
author | Ian Rogers <irogers@google.com> | 2014-06-05 20:48:42 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2014-06-10 23:19:29 -0700 |
commit | c5f17732d8144491c642776b6b48c85dfadf4b52 (patch) | |
tree | 811daa488ae5ee5dfd9b3b73bd210bc1506e5ca1 /runtime/mem_map.h | |
parent | 08654d40cdd256f6a6c8619bf06d04d4c819714a (diff) | |
download | android_art-c5f17732d8144491c642776b6b48c85dfadf4b52.tar.gz android_art-c5f17732d8144491c642776b6b48c85dfadf4b52.tar.bz2 android_art-c5f17732d8144491c642776b6b48c85dfadf4b52.zip |
Remove deprecated WITH_HOST_DALVIK.
Bug: 13751317
Fix the Mac build:
- disable x86 selector removal that causes OS/X 10.9 kernel panics,
- madvise don't need does zero memory on the Mac, factor into MemMap
routine,
- switch to the elf.h in elfutils to avoid Linux kernel dependencies,
- we can't rely on exclusive_owner_ being available from other pthread
libraries so maintain our own when futexes aren't available (we
can't rely on the OS/X 10.8 hack any more),
- fix symbol naming in assembly code,
- work around C library differences,
- disable backtrace in DumpNativeStack to avoid a broken libbacktrace
dependency,
- disable main thread signal handling logic,
- align the stack in stub_test,
- use $(HOST_SHLIB_SUFFIX) rather than .so in host make file variables.
Not all host tests are passing on the Mac with this change. dex2oat
works as does running HelloWorld.
Change-Id: I5a232aedfb2028524d49daa6397a8e60f3ee40d3
Diffstat (limited to 'runtime/mem_map.h')
-rw-r--r-- | runtime/mem_map.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/mem_map.h b/runtime/mem_map.h index dc5909b105..e42251ce57 100644 --- a/runtime/mem_map.h +++ b/runtime/mem_map.h @@ -30,6 +30,12 @@ namespace art { +#ifdef __linux__ +static constexpr bool kMadviseZeroes = true; +#else +static constexpr bool kMadviseZeroes = false; +#endif + // Used to keep track of mmap segments. // // On 64b systems not supporting MAP_32BIT, the implementation of MemMap will do a linear scan @@ -77,6 +83,8 @@ class MemMap { bool Protect(int prot); + void MadviseDontNeedAndZero(); + int GetProtect() const { return prot_; } |