summaryrefslogtreecommitdiff
path: root/compiler-rt
diff options
context:
space:
mode:
authorDavid Carlier <devnexen@gmail.com>2019-01-11 20:09:24 +0000
committerDavid Carlier <devnexen@gmail.com>2019-01-11 20:09:24 +0000
commited5ebdd6ab576459f9c4fa0120f6dbf89509c832 (patch)
tree4567819c11ef2a47d09e611d56d3e0dabca3963a /compiler-rt
parent5bb941c76444c4b365d6a08e5773e197abd45eb7 (diff)
[Sanitizer] Disable getusershell interception for Android
Reviewers: vitalybuka, pcc, eugenis Reviewed By: eugenis Differential Revision: https://reviews.llvm.org/D56583
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h2
-rw-r--r--compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
index 96fb0b84e08..bf5f4ae0ed9 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -548,7 +548,7 @@
#define SANITIZER_INTERCEPT_GETFSENT (SI_FREEBSD || SI_NETBSD || SI_MAC)
#define SANITIZER_INTERCEPT_ARC4RANDOM (SI_FREEBSD || SI_NETBSD)
#define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
-#define SANITIZER_INTERCEPT_GETUSERSHELL SI_POSIX
+#define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_POSIX)
#define SANITIZER_INTERCEPT_POPEN SI_POSIX
#define SANITIZER_INTERCEPT_POPENVE SI_NETBSD
diff --git a/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc b/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc
index 56544235500..c00d75f1121 100644
--- a/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc
+++ b/compiler-rt/test/sanitizer_common/TestCases/Posix/getusershell.cc
@@ -1,6 +1,6 @@
// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
-// XFAIL: android
+// UNSUPPORTED: android
#include <assert.h>
#include <errno.h>