[llvm-branch-commits] [compiler-rt-branch] r270405 - Merging r262303:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Mon May 23 03:21:21 2016
New Revision: 270405

URL: http://llvm.org/viewvc/llvm-project?rev=270405&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/lib/sanitizer_common/sanitizer_tls_get_addr.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 03:21:21 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261982,262209,262302,262690
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261982,262209,262302-262303,262690

Modified: compiler-rt/branches/release_38/lib/sanitizer_common/sanitizer_tls_get_addr.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/sanitizer_common/sanitizer_tls_get_addr.cc?rev=270405&r1=270404&r2=270405&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/sanitizer_common/sanitizer_tls_get_addr.cc (original)
+++ compiler-rt/branches/release_38/lib/sanitizer_common/sanitizer_tls_get_addr.cc Mon May 23 03:21:21 2016
@@ -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."