From 9bf3acd5ff8e55f5c102e189e3298366d341946f Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Thu, 18 Feb 2016 07:08:26 +0000 Subject: [PATCH] [compiler-rt] Return correct size of struct pthread for glibc-2.12.2 There seems to be a difference between 2.12.1 and 2.12.2 in 64-bit build. Tested on Scientific Linux 6.6, based on RHEL. Differential Revision: http://reviews.llvm.org/D17190 llvm-svn: 261193 --- compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc index 8cf2c73..04031d2 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc @@ -222,6 +222,11 @@ uptr ThreadDescriptorSize() { char *end; int minor = internal_simple_strtoll(buf + 8, &end, 10); if (end != buf + 8 && (*end == '\0' || *end == '.')) { + int patch = 0; + if (*end == '.') + // strtoll will return 0 if no valid conversion could be performed + patch = internal_simple_strtoll(end + 1, nullptr, 10); + /* sizeof(struct pthread) values from various glibc versions. */ if (SANITIZER_X32) val = 1728; // Assume only one particular version for x32. @@ -235,9 +240,9 @@ uptr ThreadDescriptorSize() { val = FIRST_32_SECOND_64(1136, 1712); else if (minor == 10) val = FIRST_32_SECOND_64(1168, 1776); - else if (minor <= 12) + else if (minor == 11 || (minor == 12 && patch == 1)) val = FIRST_32_SECOND_64(1168, 2288); - else if (minor == 13) + else if (minor <= 13) val = FIRST_32_SECOND_64(1168, 2304); else val = FIRST_32_SECOND_64(1216, 2304); -- 2.7.4