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/runtime_linux.cc | |
| parent | 08654d40cdd256f6a6c8619bf06d04d4c819714a (diff) | |
| download | art-c5f17732d8144491c642776b6b48c85dfadf4b52.tar.gz art-c5f17732d8144491c642776b6b48c85dfadf4b52.tar.bz2 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/runtime_linux.cc')
| -rw-r--r-- | runtime/runtime_linux.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/runtime_linux.cc b/runtime/runtime_linux.cc index 960d3324d3..46ee27405f 100644 --- a/runtime/runtime_linux.cc +++ b/runtime/runtime_linux.cc @@ -327,7 +327,7 @@ void HandleUnexpectedSignal(int signal_number, siginfo_t* info, void* raw_contex while (true) { } } - +#ifdef __linux__ // Remove our signal handler for this signal... struct sigaction action; memset(&action, 0, sizeof(action)); @@ -336,6 +336,9 @@ void HandleUnexpectedSignal(int signal_number, siginfo_t* info, void* raw_contex sigaction(signal_number, &action, NULL); // ...and re-raise so we die with the appropriate status. kill(getpid(), signal_number); +#else + exit(EXIT_FAILURE); +#endif } void Runtime::InitPlatformSignalHandlers() { |