Cherry-pick compiler-rt revision 338606 (PR sanitizer/86022).

Fix sizeof(struct pthread) in glibc 2.14.

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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@263246 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 52b88337f0017fa691f22cccac8efa3b275de506..556fdfbddc49e5956f26717a50f3d963a1c84e05 100644 (file)
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+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-08-01  Marek Polacek  <polacek@redhat.com>
 
        PR sanitizer/86759

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