maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Switch Android from TLS_SLOT_TSAN(8) to TLS_SLOT_SANITIZER(6)" 

Breaks sanitizer-android buildbot.

This reverts commit 85e02baff327e7b67ea5b47897302901abb2aa5d.

llvm-svn: 349093
This commit is contained in:
Evgeniy Stepanov 2018-12-13 23:47:59 +00:00
parent eb238ecf0f
commit e6acf2c3b4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler-rt/lib/sanitizer_common/sanitizer_linux.h
View File

@ -134,13 +134,13 @@ void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr));
#error "Unsupported architecture." #error "Unsupported architecture."
#endif #endif
// The Android Bionic team has allocated a TLS slot for sanitizers starting // The Android Bionic team has allocated a TLS slot for TSan starting with N,
// with Q, given that Android currently doesn't support ELF TLS. It is used to // given that Android currently doesn't support ELF TLS. It is used to store
// store sanitizer thread specific data. // Sanitizers thread specific data.
static const int TLS_SLOT_SANITIZER = 6; static const int TLS_SLOT_TSAN = 8;
ALWAYS_INLINE uptr *get_android_tls_ptr() { 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 #endif // SANITIZER_ANDROID