diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2018-12-13 23:47:59 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2018-12-13 23:47:59 +0000 |
| commit | cd0ed89fd4439032105e3259d47335503603ce7a (patch) | |
| tree | 65a2d3281c80f05198afdf0039cba0cc30942239 | |
| parent | 81d7839b9793eaac0e8cf38e15d24d938fb76d60 (diff) | |
Revert "Switch Android from TLS_SLOT_TSAN(8) to TLS_SLOT_SANITIZER(6)"
Breaks sanitizer-android buildbot.
This reverts commit 85e02baff327e7b67ea5b47897302901abb2aa5d.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@349093 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/sanitizer_common/sanitizer_linux.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux.h b/lib/sanitizer_common/sanitizer_linux.h index c309e33f8..6f5387e16 100644 --- a/lib/sanitizer_common/sanitizer_linux.h +++ b/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<uptr *>(&__get_tls()[TLS_SLOT_SANITIZER]); + return reinterpret_cast<uptr *>(&__get_tls()[TLS_SLOT_TSAN]); } #endif // SANITIZER_ANDROID |