summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2013-08-18 10:04:51 +0000
committerChandler Carruth <chandlerc@gmail.com>2013-08-18 10:04:51 +0000
commit45c9df5517260bea38ea8583c68756f9a9aaec5b (patch)
treeda17ed3acebe88b13beab73b194e0751cf2a1110
parent8766b8162c8e0e2f57baf7aa47736f89aaaac9dc (diff)
downloadcompiler-rt-45c9df5517260bea38ea8583c68756f9a9aaec5b.tar.gz
compiler-rt-45c9df5517260bea38ea8583c68756f9a9aaec5b.tar.bz2
compiler-rt-45c9df5517260bea38ea8583c68756f9a9aaec5b.tar.xz
It appears that glibc 2.13 has the same thread descriptor size as 2.11,
bump up the inflection point to 2.14. If someone can tell me how to actually figure out value for this, that would be awesome. Anyways, this takes me to one ASan failure, one LSan failure, and three TSan failures for 'check-all' on Linux. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@188635 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/sanitizer_linux_libcdep.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
index 2f9b6856..a40181b9 100644
--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc
@@ -196,9 +196,9 @@ uptr GetTlsSize() {
#if defined(__x86_64__) || defined(__i386__)
// sizeof(struct thread) from glibc.
-// There has been a report of this being different on glibc 2.11. We don't know
-// when this change happened, so 2.12 is a conservative estimate.
-#if __GLIBC_PREREQ(2, 12)
+// There has been a report of this being different on glibc 2.11 and 2.13. We
+// don't know when this change happened, so 2.14 is a conservative estimate.
+#if __GLIBC_PREREQ(2, 14)
const uptr kThreadDescriptorSize = FIRST_32_SECOND_64(1216, 2304);
#else
const uptr kThreadDescriptorSize = FIRST_32_SECOND_64(1168, 2304);