summaryrefslogtreecommitdiff
path: root/lib/sanitizer_common/sanitizer_mac.cc
diff options
context:
space:
mode:
authorFrancis Ricci <francisjricci@gmail.com>2017-05-17 15:25:41 +0000
committerFrancis Ricci <francisjricci@gmail.com>2017-05-17 15:25:41 +0000
commitea3b9d9e843576962991c63e7e644fe507775db0 (patch)
treef508b4b4aca95d108a6fda8f79978d692e262849 /lib/sanitizer_common/sanitizer_mac.cc
parent38cc92468ebb3b822a4ae9387939ad99b06fe56a (diff)
Revert "Implement tls scanning for darwin LSan"
This reverts r303262, due to TSan buildbot breakages. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@303266 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_mac.cc')
-rw-r--r--lib/sanitizer_common/sanitizer_mac.cc25
1 files changed, 2 insertions, 23 deletions
diff --git a/lib/sanitizer_common/sanitizer_mac.cc b/lib/sanitizer_common/sanitizer_mac.cc
index 6fa2e4a66..2f990b805 100644
--- a/lib/sanitizer_common/sanitizer_mac.cc
+++ b/lib/sanitizer_common/sanitizer_mac.cc
@@ -370,27 +370,6 @@ uptr GetTlsSize() {
void InitTlsSize() {
}
-uptr TlsBaseAddr() {
- uptr segbase = 0;
-#if defined(__x86_64__)
- asm("movq %%gs:0,%0" : "=r"(segbase));
-#elif defined(__i386__)
- asm("movl %%gs:0,%0" : "=r"(segbase));
-#endif
- return segbase;
-}
-
-// The size of the tls on darwin does not appear to be well documented,
-// however the vm memory map suggests that it is 1024 uptrs in size,
-// with a size of 0x2000 bytes on x86_64 and 0x1000 bytes on i386.
-uptr TlsSize() {
-#if defined(__x86_64__) || defined(__i386__)
- return 1024 * sizeof(uptr);
-#else
- return 0;
-#endif
-}
-
void GetThreadStackAndTls(bool main, uptr *stk_addr, uptr *stk_size,
uptr *tls_addr, uptr *tls_size) {
#if !SANITIZER_GO
@@ -398,8 +377,8 @@ void GetThreadStackAndTls(bool main, uptr *stk_addr, uptr *stk_size,
GetThreadStackTopAndBottom(main, &stack_top, &stack_bottom);
*stk_addr = stack_bottom;
*stk_size = stack_top - stack_bottom;
- *tls_addr = TlsBaseAddr();
- *tls_size = TlsSize();
+ *tls_addr = 0;
+ *tls_size = 0;
#else
*stk_addr = 0;
*stk_size = 0;