From b4f1f01d453a0ca4f05dc78fc3769e6561592c66 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 2 Aug 2018 11:32:58 +0200 Subject: [PATCH] Cherry-pick compiler-rt revision 338606 (PR sanitizer/86022). Fix sizeof(struct pthread) in glibc 2.14. 2018-08-02 Martin Liska PR sanitizer/86022 * sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize): Cherry-pick compiler-rt revision 338606. From-SVN: r263246 --- libsanitizer/ChangeLog | 6 ++++++ libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 52b88337f00..556fdfbddc4 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2018-08-02 Martin Liska + + PR sanitizer/86022 + * sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize): + Cherry-pick compiler-rt revision 338606. + 2018-08-01 Marek Polacek PR sanitizer/86759 diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc index d27a8435802..3b1a2174c46 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc @@ -235,7 +235,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); -- 2.30.2