Backport r263246

2018-08-16  Martin Liska  <mliska@suse.cz>

	Backport from mainline
	2018-08-02  Martin Liska  <mliska@suse.cz>

        PR sanitizer/86022
	* sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize):
        Cherry-pick compiler-rt revision 338606.

From-SVN: r263581

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index a127bb0c2d60145d1ad23936b0ea3d7e0db021ce..8eab49f00b41c6790eb3393592c9e546c93d3f72 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,12 @@
+2018-08-16  Martin Liska  <mliska@suse.cz>
+
+       Backport from mainline
+       2018-08-02  Martin Liska  <mliska@suse.cz>
+
+        PR sanitizer/86022
+       * sanitizer_common/sanitizer_linux_libcdep.cc (ThreadDescriptorSize):
+        Cherry-pick compiler-rt revision 338606.
+
 2018-06-22  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline

diff --git a/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc
index dc342de6e10d69897a48dba2e7331a65a89719cd..7c94a5fc615dece92a4e14dd5b6c612940cb0c07 100644 (file)
--- 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);