[compiler-rt] r240854 - [asan] Disable glibc-specific code chunk on Android.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Jun 26 18:39:23 2015
New Revision: 240854

URL: http://llvm.org/viewvc/llvm-project?rev=240854&view=rev
Log:
[asan] Disable glibc-specific code chunk on Android.

Fixes quarantine_size_mb.cc test on the Android bot.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=240854&r1=240853&r2=240854&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Fri Jun 26 18:39:23 2015
@@ -1000,7 +1000,7 @@ void *internal_start_thread(void(*func)(
   // Start the thread with signals blocked, otherwise it can steal user signals.
   __sanitizer_sigset_t set, old;
   internal_sigfillset(&set);
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !SANITIZER_ANDROID
   // Glibc uses SIGSETXID signal during setuid call. If this signal is blocked
   // on any thread, setuid call hangs (see test/tsan/setuid.c).
   internal_sigdelset(&set, 33);