diff options
| author | Kostya Kortchinsky <kostyak@google.com> | 2017-11-10 19:01:17 +0000 |
|---|---|---|
| committer | Kostya Kortchinsky <kostyak@google.com> | 2017-11-10 19:01:17 +0000 |
| commit | b36555d06db5e3707103c0f485d4acacc53084e9 (patch) | |
| tree | 6774b1bd7f7d6674541a465a4815f41fecea5509 /lib/scudo/scudo_utils.cpp | |
| parent | 12b1846b2996b3a333b74fa7cd1e56931d7c5fa7 (diff) | |
[scudo] Bump the Android API level requirement to 21 for getauxval
Summary:
`getauxval` was introduced in 18 & 21 depending on the architecture. Bump the
requirement to 21.
It also turns out that the NDK is finicky: NDK r13b doesn't include sys/auxv.h
when creating a standalone toolchain at API level 19 for ARM. So 18 didn't work
well with older NDKs.
Reviewers: alekseyshl
Reviewed By: alekseyshl
Subscribers: aemerson, srhines, llvm-commits, kristof.beyls
Differential Revision: https://reviews.llvm.org/D39905
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@317907 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/scudo/scudo_utils.cpp')
| -rw-r--r-- | lib/scudo/scudo_utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scudo/scudo_utils.cpp b/lib/scudo/scudo_utils.cpp index 653b6c8fa..fb082a475 100644 --- a/lib/scudo/scudo_utils.cpp +++ b/lib/scudo/scudo_utils.cpp @@ -18,9 +18,9 @@ # include <cpuid.h> #endif #if defined(__arm__) || defined(__aarch64__) -# 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. +# if SANITIZER_ANDROID && __ANDROID_API__ < 21 +// getauxval() was introduced with API level 18 for ARM and 21 for AArch64. +// Emulate it using /proc/self/auxv for lower API levels. # include "sanitizer_common/sanitizer_posix.h" # include <fcntl.h> |