Commit 3ab9eb53 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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
------------------------------------------------------------------------

llvm-svn: 338691
parent 5006581f

compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc

+1 −1
Original line number Diff line number Diff line
@@ -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);