From f286ed96cb5d7325fe071e5780e023e5365c0cfa Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 16 Aug 2018 12:19:16 +0200 Subject: [PATCH] Backport r263246 2018-08-16 Martin Liska Backport from mainline 2018-08-02 Martin Liska PR sanitizer/86022 * sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize): Cherry-pick compiler-rt revision 338606. From-SVN: r263581 --- libsanitizer/ChangeLog | 9 +++++++++ libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index a127bb0c2d60..8eab49f00b41 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,12 @@ +2018-08-16 Martin Liska + + Backport from mainline + 2018-08-02 Martin Liska + + PR sanitizer/86022 + * sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize): + Cherry-pick compiler-rt revision 338606. + 2018-06-22 Jakub Jelinek Backported from mainline diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc index dc342de6e10d..7c94a5fc615d 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc @@ -236,7 +236,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.47.2