diff options
| author | Dave Allison <dallison@google.com> | 2014-07-10 02:05:10 +0000 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-07-10 21:24:47 +0000 |
| commit | 7fb36ded9cd5b1d254b63b3091f35c1e6471b90e (patch) | |
| tree | eb1e3b96efd67cc6b84a6f7e35522f33973ca8db /runtime/thread_linux.cc | |
| parent | 93279da4a8475d187a0a2e75d50c88def5b4b8a5 (diff) | |
| download | art-7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.tar.gz art-7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.tar.bz2 art-7fb36ded9cd5b1d254b63b3091f35c1e6471b90e.zip | |
Revert "Revert "Add implicit null and stack checks for x86""
Fixes x86_64 cross compile issue. Removes command line options
and property to set implicit checks - this is hard coded now.
This reverts commit 3d14eb620716e92c21c4d2c2d11a95be53319791.
Change-Id: I5404473b5aaf1a9c68b7181f5952cb174d93a90d
Diffstat (limited to 'runtime/thread_linux.cc')
| -rw-r--r-- | runtime/thread_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/thread_linux.cc b/runtime/thread_linux.cc index ee66ccc29a..518211bad7 100644 --- a/runtime/thread_linux.cc +++ b/runtime/thread_linux.cc @@ -35,8 +35,8 @@ static void SigAltStack(stack_t* new_stack, stack_t* old_stack) { void Thread::SetUpAlternateSignalStack() { // Create and set an alternate signal stack. stack_t ss; - ss.ss_sp = new uint8_t[SIGSTKSZ]; - ss.ss_size = SIGSTKSZ; + ss.ss_sp = new uint8_t[SIGSTKSZ * 2]; // NB. this is 16K. + ss.ss_size = SIGSTKSZ * 2; ss.ss_flags = 0; CHECK(ss.ss_sp != NULL); SigAltStack(&ss, NULL); @@ -56,7 +56,7 @@ void Thread::TearDownAlternateSignalStack() { // Tell the kernel to stop using it. ss.ss_sp = NULL; ss.ss_flags = SS_DISABLE; - ss.ss_size = SIGSTKSZ; // Avoid ENOMEM failure with Mac OS' buggy libc. + ss.ss_size = SIGSTKSZ * 2; // Avoid ENOMEM failure with Mac OS' buggy libc. SigAltStack(&ss, NULL); // Free it. |