[llvm-branch-commits] [compiler-rt-branch] r338691 - Merging r338606:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug  2 02:03:14 2018
New Revision: 338691

URL: http://llvm.org/viewvc/llvm-project?rev=338691&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_70/   (props changed)
    compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_linux_libcdep.cc

Propchange: compiler-rt/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  2 02:03:14 2018
@@ -1 +1 @@
-/compiler-rt/trunk:338577
+/compiler-rt/trunk:338577,338606

Modified: compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_linux_libcdep.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_linux_libcdep.cc?rev=338691&r1=338690&r2=338691&view=diff
==============================================================================
--- compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_linux_libcdep.cc (original)
+++ compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_linux_libcdep.cc Thu Aug  2 02:03:14 2018
@@ -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);