summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2015-06-26 23:39:23 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2015-06-26 23:39:23 +0000
commitfae81fc05726af91f4caa20ff521158127c09480 (patch)
tree6eaaf8dac2abeb63237bb6dd9346e90bc166530a
parent0297aca263bfaae2d08efe6bcf74af0425d18a61 (diff)
downloadcompiler-rt-fae81fc05726af91f4caa20ff521158127c09480.tar.gz
[asan] Disable glibc-specific code chunk on Android.
Fixes quarantine_size_mb.cc test on the Android bot. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@240854 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/sanitizer_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
index 7ba690eb6..bc2eef25c 100644
--- a/lib/sanitizer_common/sanitizer_linux.cc
+++ b/lib/sanitizer_common/sanitizer_linux.cc
@@ -1000,7 +1000,7 @@ void *internal_start_thread(void(*func)(void *arg), void *arg) {
// 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);