From e6acf2c3b4e62438a2d1daeb23f2bdacb0222265 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Thu, 13 Dec 2018 23:47:59 +0000 Subject: [PATCH] Revert "Switch Android from TLS_SLOT_TSAN(8) to TLS_SLOT_SANITIZER(6)" Breaks sanitizer-android buildbot. This reverts commit 85e02baff327e7b67ea5b47897302901abb2aa5d. llvm-svn: 349093 --- compiler-rt/lib/sanitizer_common/sanitizer_linux.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h index c309e33f81b1..6f5387e162c6 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.h @@ -134,13 +134,13 @@ void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr)); #error "Unsupported architecture." #endif -// The Android Bionic team has allocated a TLS slot for sanitizers starting -// with Q, given that Android currently doesn't support ELF TLS. It is used to -// store sanitizer thread specific data. -static const int TLS_SLOT_SANITIZER = 6; +// The Android Bionic team has allocated a TLS slot for TSan starting with N, +// given that Android currently doesn't support ELF TLS. It is used to store +// Sanitizers thread specific data. +static const int TLS_SLOT_TSAN = 8; ALWAYS_INLINE uptr *get_android_tls_ptr() { - return reinterpret_cast(&__get_tls()[TLS_SLOT_SANITIZER]); + return reinterpret_cast(&__get_tls()[TLS_SLOT_TSAN]); } #endif // SANITIZER_ANDROID