summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohit K. Bhakkad <mohit.bhakkad@gmail.com>2016-05-23 08:21:21 +0000
committerMohit K. Bhakkad <mohit.bhakkad@gmail.com>2016-05-23 08:21:21 +0000
commit1361fe7990f4367eb9b1449ab0f952fee51b315f (patch)
tree07e20442e811e76f4364e924d387cb3a0503f404
parentb5e63e04a73ac485c0336b471ba692a8e1b75219 (diff)
downloadcompiler-rt-1361fe7990f4367eb9b1449ab0f952fee51b315f.tar.gz
Merging r262303:
------------------------------------------------------------------------ r262303 | mohit.bhakkad | 2016-03-01 11:26:33 +0530 (Tue, 01 Mar 2016) | 7 lines [Compiler-rt][MIPS] Correct Dynamic Thread Vector offset for MIPS Reviewers: samsonov Subscribers: dsanders, jaydeep, sagar, llvm-commits Differential Revision: http://reviews.llvm.org/D17703 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_38@270405 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/sanitizer_tls_get_addr.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_tls_get_addr.cc b/lib/sanitizer_common/sanitizer_tls_get_addr.cc
index 213aced89..77c1947d5 100644
--- a/lib/sanitizer_common/sanitizer_tls_get_addr.cc
+++ b/lib/sanitizer_common/sanitizer_tls_get_addr.cc
@@ -78,7 +78,7 @@ void DTLS_Destroy() {
DTLS_Deallocate(dtls.dtv, s);
}
-#if defined(__powerpc64__)
+#if defined(__powerpc64__) || defined(__mips__)
// This is glibc's TLS_DTV_OFFSET:
// "Dynamic thread vector pointers point 0x8000 past the start of each
// TLS block."