[llvm-branch-commits] [compiler-rt-branch] r270549 - Merging r261980:

[Sagar Thakur via llvm-branch-commits]

Author: slthakur
Date: Tue May 24 06:11:57 2016
New Revision: 270549

URL: http://llvm.org/viewvc/llvm-project?rev=270549&view=rev
Log:
Merging r261980:
------------------------------------------------------------------------
r261980 | slthakur | 2016-02-26 11:26:54 +0530 (Fri, 26 Feb 2016) | 8 lines

[MSAN] Fix test SmallPreAllocatedStackThread for MIPS

Summary: Msan was intercepting version 2.1 of the pthread_create function which was making it to crash in libc because __pthread_create_2_1 modifies the stack attributes of the thread. Intercepting the correct version fixes the test SmallPreAllocatedStackThread.

Reviewers: eugenis, samsonov
Subscribers: llvm-commits, mohit.bhakkad, jaydeep
Differential: http://reviews.llvm.org/D17603

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 24 06:11:57 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261982,262209,262302-262303,262690,263001,263218
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721,261723,261837,261980,261982,262209,262302-262303,262690,263001,263218

Modified: compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc?rev=270549&r1=270548&r2=270549&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc (original)
+++ compiler-rt/branches/release_38/lib/msan/msan_interceptors.cc Tue May 24 06:11:57 2016
@@ -1628,7 +1628,11 @@ void InitializeInterceptors() {
   INTERCEPT_FUNCTION(getrusage);
   INTERCEPT_FUNCTION(sigaction);
   INTERCEPT_FUNCTION(signal);
+#if defined(__mips__)
+  INTERCEPT_FUNCTION_VER(pthread_create, "GLIBC_2.2");
+#else
   INTERCEPT_FUNCTION(pthread_create);
+#endif
   INTERCEPT_FUNCTION(pthread_key_create);
   INTERCEPT_FUNCTION(pthread_join);
   INTERCEPT_FUNCTION(tzset);