summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Kortchinsky <kostyak@google.com>2017-10-16 17:06:13 +0000
committerKostya Kortchinsky <kostyak@google.com>2017-10-16 17:06:13 +0000
commit73a80c5493cd77f83048c753b093e1122184ebc3 (patch)
tree057f4aeebb83cc6f50c5cccbc1b7d8b2b6e17a4c
parent9dff31c7692c8e9c22c68e89d19d74cf38d4a747 (diff)
downloadbcm5719-llvm-73a80c5493cd77f83048c753b093e1122184ebc3.tar.gz
bcm5719-llvm-73a80c5493cd77f83048c753b093e1122184ebc3.zip
[scudo] Do not include sanitizer_posix.h if not on a Posix platform
Summary: Move the `sanitizer_posix.h` include within the `SANITIZER_ANDROID` `#if`, otherwise this errors when built on non-Posix platforms (eg: Fuchsia). Reviewers: alekseyshl Reviewed By: alekseyshl Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D38956 llvm-svn: 315917
-rw-r--r--compiler-rt/lib/scudo/scudo_utils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/scudo/scudo_utils.cpp b/compiler-rt/lib/scudo/scudo_utils.cpp
index 71d1b2e1b77..093eafe8edc 100644
--- a/compiler-rt/lib/scudo/scudo_utils.cpp
+++ b/compiler-rt/lib/scudo/scudo_utils.cpp
@@ -13,8 +13,6 @@
#include "scudo_utils.h"
-#include "sanitizer_common/sanitizer_posix.h"
-
#include <stdarg.h>
#if defined(__x86_64__) || defined(__i386__)
# include <cpuid.h>
@@ -23,6 +21,8 @@
# if SANITIZER_ANDROID && __ANDROID_API__ < 18
// getauxval() was introduced with API level 18 on Android. Emulate it using
// /proc/self/auxv for lower API levels.
+# include "sanitizer_common/sanitizer_posix.h"
+
# include <fcntl.h>
# define AT_HWCAP 16
OpenPOWER on IntegriCloud