diff options
| author | Hans Wennborg <hans@hanshq.net> | 2018-08-02 09:03:14 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2018-08-02 09:03:14 +0000 |
| commit | 94376f1f22052e29f1ac4c2eb83393c2edb2a30c (patch) | |
| tree | aa81e305600abaa9cd86753ee30220b9d1bcc0fe /lib/sanitizer_common/sanitizer_linux_libcdep.cc | |
| parent | 050ac2a989fffb16f2709218a5650563e763d56a (diff) | |
Merging r338606:
------------------------------------------------------------------------
r338606 | kcc | 2018-08-01 20:29:51 +0200 (Wed, 01 Aug 2018) | 11 lines
Fix sizeof(struct pthread) in glibc 2.14.
Summary: Fixes: https://github.com/google/sanitizers/issues/966
Reviewers: kcc
Reviewed By: kcc
Subscribers: kubamracek
Differential Revision: https://reviews.llvm.org/D50131
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_70@338691 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_linux_libcdep.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux_libcdep.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 1c7fb7db8..4962ff832 100644 --- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -292,7 +292,7 @@ uptr ThreadDescriptorSize() { val = FIRST_32_SECOND_64(1168, 1776); else if (minor == 11 || (minor == 12 && patch == 1)) val = FIRST_32_SECOND_64(1168, 2288); - else if (minor <= 13) + else if (minor <= 14) val = FIRST_32_SECOND_64(1168, 2304); else val = FIRST_32_SECOND_64(1216, 2304); |