diff options
author | Kuba Brecka <kuba.brecka@gmail.com> | 2014-11-05 18:55:38 +0000 |
---|---|---|
committer | Kuba Brecka <kuba.brecka@gmail.com> | 2014-11-05 18:55:38 +0000 |
commit | 36db4027241f7c1a84f7c84fbefb807a6ccd3566 (patch) | |
tree | 765fa0008cb6ffca171129afbfbf6e24f31c9c0f /lib/sanitizer_common/sanitizer_mac.cc | |
parent | 41a7c14f7f11fa02aa229e867abb6944c8779705 (diff) |
Extend the OS X pthread_get_stacksize_np workaround to 10.10
Fixes a failing ASan testcase (TestCases/stack-use-after-return.cc) on OS X 10.10.
Reviewed at http://reviews.llvm.org/D6120
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@221380 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_mac.cc')
-rw-r--r-- | lib/sanitizer_common/sanitizer_mac.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_mac.cc b/lib/sanitizer_common/sanitizer_mac.cc index f50c2a10b..1b7708739 100644 --- a/lib/sanitizer_common/sanitizer_mac.cc +++ b/lib/sanitizer_common/sanitizer_mac.cc @@ -160,7 +160,7 @@ void GetThreadStackTopAndBottom(bool at_initialization, uptr *stack_top, // pthread_get_stacksize_np() returns an incorrect stack size for the main // thread on Mavericks. See // https://code.google.com/p/address-sanitizer/issues/detail?id=261 - if ((GetMacosVersion() == MACOS_VERSION_MAVERICKS) && at_initialization && + if ((GetMacosVersion() >= MACOS_VERSION_MAVERICKS) && at_initialization && stacksize == (1 << 19)) { struct rlimit rl; CHECK_EQ(getrlimit(RLIMIT_STACK, &rl), 0); |